We are printing all other help output to stdout already (e.g. "-help",
"-cpu help" and "-machine help" output). So the "-net nic,model=help"
output should go to stdout instead of stderr, too. And while we're at
it, also print the NICs line by line, like we do it e.g. with the
"-cpu help" or "-M help" output, too.
Buglink: https://bugs.launchpad.net/qemu/+bug/1574327
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
net/net.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/net.c b/net/net.c
index f3a3c5444c..2cf5e76469 100644
--- a/net/net.c
+++ b/net/net.c
@@ -837,9 +837,10 @@ int qemu_show_nic_models(const char *arg, const char *const *models)
return 0;
}
- fprintf(stderr, "qemu: Supported NIC models: ");
- for (i = 0 ; models[i]; i++)
- fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n');
+ printf("Supported NIC models:\n");
+ for (i = 0 ; models[i]; i++) {
+ printf("%s\n", models[i]);
+ }
return 1;
}
--
2.21.0
On 4/23/19 6:06 PM, Thomas Huth wrote: > We are printing all other help output to stdout already (e.g. "-help", > "-cpu help" and "-machine help" output). So the "-net nic,model=help" > output should go to stdout instead of stderr, too. And while we're at > it, also print the NICs line by line, like we do it e.g. with the > "-cpu help" or "-M help" output, too. > > Buglink: https://bugs.launchpad.net/qemu/+bug/1574327 > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > net/net.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/net/net.c b/net/net.c > index f3a3c5444c..2cf5e76469 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -837,9 +837,10 @@ int qemu_show_nic_models(const char *arg, const char *const *models) > return 0; > } > > - fprintf(stderr, "qemu: Supported NIC models: "); > - for (i = 0 ; models[i]; i++) > - fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n'); > + printf("Supported NIC models:\n"); > + for (i = 0 ; models[i]; i++) { > + printf("%s\n", models[i]); > + } > return 1; > } > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 23/04/2019 18:06, Thomas Huth wrote: > We are printing all other help output to stdout already (e.g. "-help", > "-cpu help" and "-machine help" output). So the "-net nic,model=help" > output should go to stdout instead of stderr, too. And while we're at > it, also print the NICs line by line, like we do it e.g. with the > "-cpu help" or "-M help" output, too. > > Buglink: https://bugs.launchpad.net/qemu/+bug/1574327 > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > net/net.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/net/net.c b/net/net.c > index f3a3c5444c..2cf5e76469 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -837,9 +837,10 @@ int qemu_show_nic_models(const char *arg, const char *const *models) > return 0; > } > > - fprintf(stderr, "qemu: Supported NIC models: "); > - for (i = 0 ; models[i]; i++) > - fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n'); > + printf("Supported NIC models:\n"); > + for (i = 0 ; models[i]; i++) { > + printf("%s\n", models[i]); > + } > return 1; > } > > Applied to my trivial-patches branch. Thanks, Laurent
[adding Markus, as he send a recent batch of similar patches] On 4/23/19 11:06 AM, Thomas Huth wrote: > We are printing all other help output to stdout already (e.g. "-help", > "-cpu help" and "-machine help" output). So the "-net nic,model=help" > output should go to stdout instead of stderr, too. And while we're at > it, also print the NICs line by line, like we do it e.g. with the > "-cpu help" or "-M help" output, too. > > Buglink: https://bugs.launchpad.net/qemu/+bug/1574327 > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > net/net.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > diff --git a/net/net.c b/net/net.c > index f3a3c5444c..2cf5e76469 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -837,9 +837,10 @@ int qemu_show_nic_models(const char *arg, const char *const *models) > return 0; > } > > - fprintf(stderr, "qemu: Supported NIC models: "); > - for (i = 0 ; models[i]; i++) > - fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n'); > + printf("Supported NIC models:\n"); > + for (i = 0 ; models[i]; i++) { > + printf("%s\n", models[i]); > + } > return 1; > } > > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
© 2016 - 2024 Red Hat, Inc.