From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

opt was declared as a separate local inside the last loop,
shadowing the local at the top of the function.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 util/qemu-option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/qemu-option.c b/util/qemu-option.c
index 9b1dc8093b..877c5b4d67 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -766,7 +766,7 @@ void qemu_opts_print(QemuOpts *opts, const char *separator)
     }
     for (; desc && desc->name; desc++) {
         const char *value;
-        QemuOpt *opt = qemu_opt_find(opts, desc->name);
+        opt = qemu_opt_find(opts, desc->name);
 
         value = opt ? opt->str : desc->def_value_str;
         if (!value) {
-- 
2.13.6

On 10/05/2017 02:07 PM, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> opt was declared as a separate local inside the last loop,
> shadowing the local at the top of the function.
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
>  util/qemu-option.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/util/qemu-option.c b/util/qemu-option.c
> index 9b1dc8093b..877c5b4d67 100644
> --- a/util/qemu-option.c
> +++ b/util/qemu-option.c
> @@ -766,7 +766,7 @@ void qemu_opts_print(QemuOpts *opts, const char *separator)
>      }
>      for (; desc && desc->name; desc++) {
>          const char *value;
> -        QemuOpt *opt = qemu_opt_find(opts, desc->name);
> +        opt = qemu_opt_find(opts, desc->name);
>  
>          value = opt ? opt->str : desc->def_value_str;
>          if (!value) {
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> writes:

> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> opt was declared as a separate local inside the last loop,
> shadowing the local at the top of the function.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

I can take this through my tree.

Markus Armbruster <armbru@redhat.com> writes:

> "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> writes:
>
>> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>>
>> opt was declared as a separate local inside the last loop,
>> shadowing the local at the top of the function.
>>
>> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> I can take this through my tree.

I'd like to change the headline to "option: Remove shadowing opt decl
from qemu_opt_print()", if that's alright with you.

* Markus Armbruster (armbru@redhat.com) wrote:
> Markus Armbruster <armbru@redhat.com> writes:
> 
> > "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> writes:
> >
> >> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> >>
> >> opt was declared as a separate local inside the last loop,
> >> shadowing the local at the top of the function.
> >>
> >> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> >
> > I can take this through my tree.
> 
> I'd like to change the headline to "option: Remove shadowing opt decl
> from qemu_opt_print()", if that's alright with you.

Sure.

Dave

--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK