hw/net/vhost_net: Silence compiler warning when compiling with -Wshadow

[PATCH] hw/net/vhost_net: Silence compiler warning when compiling with -Wshadow

Posted by Thomas Huth 2 years, 4 months ago

Rename the innermost local variables to avoid compiler warnings
with "-Wshadow".

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/net/vhost_net.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 57427a3997..e8e1661646 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -313,8 +313,8 @@ fail:
                 /* Queue might not be ready for start */
                 continue;
             }
-            int r = vhost_net_set_backend(&net->dev, &file);
-            assert(r >= 0);
+            int ret = vhost_net_set_backend(&net->dev, &file);
+            assert(ret >= 0);
         }
     }
     if (net->nc->info->poll) {
@@ -629,8 +629,8 @@ err_start:
     if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
         file.fd = VHOST_FILE_UNBIND;
         file.index = idx;
-        int r = vhost_net_set_backend(&net->dev, &file);
-        assert(r >= 0);
+        int ret = vhost_net_set_backend(&net->dev, &file);
+        assert(ret >= 0);
     }
 
     vhost_dev_stop(&net->dev, vdev, false);
-- 
2.41.0

Re: [PATCH] hw/net/vhost_net: Silence compiler warning when compiling with -Wshadow

Posted by Markus Armbruster 2 years, 4 months ago

Thomas Huth <thuth@redhat.com> writes:

> Rename the innermost local variables to avoid compiler warnings
> with "-Wshadow".
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued.  Thanks!

Re: [PATCH] hw/net/vhost_net: Silence compiler warning when compiling with -Wshadow

Posted by Michael S. Tsirkin 2 years, 4 months ago

On Wed, Oct 04, 2023 at 10:49:39AM +0200, Thomas Huth wrote:
> Rename the innermost local variables to avoid compiler warnings
> with "-Wshadow".
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

feel free to merge

> ---
>  hw/net/vhost_net.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index 57427a3997..e8e1661646 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -313,8 +313,8 @@ fail:
>                  /* Queue might not be ready for start */
>                  continue;
>              }
> -            int r = vhost_net_set_backend(&net->dev, &file);
> -            assert(r >= 0);
> +            int ret = vhost_net_set_backend(&net->dev, &file);
> +            assert(ret >= 0);
>          }
>      }
>      if (net->nc->info->poll) {
> @@ -629,8 +629,8 @@ err_start:
>      if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
>          file.fd = VHOST_FILE_UNBIND;
>          file.index = idx;
> -        int r = vhost_net_set_backend(&net->dev, &file);
> -        assert(r >= 0);
> +        int ret = vhost_net_set_backend(&net->dev, &file);
> +        assert(ret >= 0);
>      }
>  
>      vhost_dev_stop(&net->dev, vdev, false);
> -- 
> 2.41.0

Re: [PATCH] hw/net/vhost_net: Silence compiler warning when compiling with -Wshadow

Posted by Jason Wang 2 years, 4 months ago

On Wed, Oct 4, 2023 at 4:57 PM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> On Wed, Oct 04, 2023 at 10:49:39AM +0200, Thomas Huth wrote:
> > Rename the innermost local variables to avoid compiler warnings
> > with "-Wshadow".
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Acked-by: Jason Wang <jasowang@redhat.com>

Thanks

>
> feel free to merge
>
> > ---
> >  hw/net/vhost_net.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> > index 57427a3997..e8e1661646 100644
> > --- a/hw/net/vhost_net.c
> > +++ b/hw/net/vhost_net.c
> > @@ -313,8 +313,8 @@ fail:
> >                  /* Queue might not be ready for start */
> >                  continue;
> >              }
> > -            int r = vhost_net_set_backend(&net->dev, &file);
> > -            assert(r >= 0);
> > +            int ret = vhost_net_set_backend(&net->dev, &file);
> > +            assert(ret >= 0);
> >          }
> >      }
> >      if (net->nc->info->poll) {
> > @@ -629,8 +629,8 @@ err_start:
> >      if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
> >          file.fd = VHOST_FILE_UNBIND;
> >          file.index = idx;
> > -        int r = vhost_net_set_backend(&net->dev, &file);
> > -        assert(r >= 0);
> > +        int ret = vhost_net_set_backend(&net->dev, &file);
> > +        assert(ret >= 0);
> >      }
> >
> >      vhost_dev_stop(&net->dev, vdev, false);
> > --
> > 2.41.0
>