commit 385c04d0b66917457b6a12fc2cfd99a6a40b2d89
author Stefan Hajnoczi <stefanha@redhat.com> Mon Jan 13 18:47:39 2014 +0800
committer Kevin Wolf <kwolf@redhat.com> Wed Jan 22 13:48:18 2014 +0100
tree fb8a553531a95fdaac59caecf44b0554be956c48
parent d80ac658f2caacfb14ea386211c4a9bea0cea280

dataplane: fix shadowed return value

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

diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index 250d45e..665a1ff 100644
--- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -376,7 +376,7 @@
         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;
             }