[Qemu-devel] [PATCH] dataplane: fix shadowed return value

[Qemu-devel] [PATCH] dataplane: fix shadowed return value

[Stefan Hajnoczi]

Propagate the error return value from get_indirect().

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/virtio/dataplane/vring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ 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;
             }
-- 
1.8.4.2

Re: [Qemu-devel] [PATCH] dataplane: fix shadowed return value

[Markus Armbruster]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> Propagate the error return value from get_indirect().
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  hw/virtio/dataplane/vring.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 @@ 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;
>              }

Broken in commit 4d684832.  Could be mentioned in commit message.

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH] dataplane: fix shadowed return value

[Peter Maydell]

On 13 January 2014 10:47, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> Propagate the error return value from get_indirect().
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

This fixes the compilation error (see also bug 1268596).

thanks
-- PMM

Re: [Qemu-devel] [PATCH] dataplane: fix shadowed return value

[Stefan Hajnoczi]

On Mon, Jan 13, 2014 at 06:47:39PM +0800, Stefan Hajnoczi wrote:
> Propagate the error return value from get_indirect().
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  hw/virtio/dataplane/vring.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Fixed commit description as suggested by Markus.

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

Re: [Qemu-devel] [PATCH] dataplane: fix shadowed return value

[Peter Maydell]

On 15 January 2014 03:46, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Mon, Jan 13, 2014 at 06:47:39PM +0800, Stefan Hajnoczi wrote:
>> Propagate the error return value from get_indirect().
>>
>> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
>> ---
>>  hw/virtio/dataplane/vring.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Fixed commit description as suggested by Markus.
>
> Thanks, applied to my block tree:
> https://github.com/stefanha/qemu/commits/block

Ping! Can we get this into master, please? It's now
been failing to compile for over a week...

thanks
-- PMM

Re: [Qemu-devel] [PATCH] dataplane: fix shadowed return value

[Kevin Wolf]

Am 23.01.2014 um 15:38 hat Peter Maydell geschrieben:
> On 15 January 2014 03:46, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> > On Mon, Jan 13, 2014 at 06:47:39PM +0800, Stefan Hajnoczi wrote:
> >> Propagate the error return value from get_indirect().
> >>
> >> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> >> ---
> >>  hw/virtio/dataplane/vring.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Fixed commit description as suggested by Markus.
> >
> > Thanks, applied to my block tree:
> > https://github.com/stefanha/qemu/commits/block
> 
> Ping! Can we get this into master, please? It's now
> been failing to compile for over a week...

Nobody seems to be processing pull requests at the moment...

This is queued for the next block layer pull request, but even the one
from two weeks ago hasn't been pulled yet. If the last one doesn't get
pulled until tomorrow, I'll send a v2 of the pull request that includes
the changes from what was planned to be three separate one-week pull
requests.

Kevin