summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-01-13 18:47:39 +0800
committerKevin Wolf <kwolf@redhat.com>2014-01-22 13:48:18 +0100
commit385c04d0b66917457b6a12fc2cfd99a6a40b2d89 (patch)
treefb8a553531a95fdaac59caecf44b0554be956c48
parentd80ac658f2caacfb14ea386211c4a9bea0cea280 (diff)
downloadfocaccia-qemu-385c04d0b66917457b6a12fc2cfd99a6a40b2d89.tar.gz
focaccia-qemu-385c04d0b66917457b6a12fc2cfd99a6a40b2d89.zip
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>
-rw-r--r--hw/virtio/dataplane/vring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index 250d45ec3d..665a1ffcb3 100644
--- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -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;
             }