dataplane: fix shadowed return value
authorStefan Hajnoczi <stefanha@redhat.com>
Mon, 13 Jan 2014 10:47:39 +0000 (18:47 +0800)
committerKevin Wolf <kwolf@redhat.com>
Wed, 22 Jan 2014 12:48:18 +0000 (13:48 +0100)
Propagate the error return value from get_indirect().  This bug was
introduced in commit 4d684832 ("vring: create a common function to parse
descriptors").

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
hw/virtio/dataplane/vring.c

index 250d45ec3d23e8a85710f43557ab46a15f38eee6..665a1ffcb39ab96cef852b6264aadfafef09dc16 100644 (file)
@@ -376,7 +376,7 @@ int vring_pop(VirtIODevice *vdev, Vring *vring,
         barrier();
 
         if (desc.flags & VRING_DESC_F_INDIRECT) {
-            int ret = get_indirect(vring, elem, &desc);
+            ret = get_indirect(vring, elem, &desc);
             if (ret < 0) {
                 goto out;
             }