From: Laurent Vivier <laurent@vivier.eu> To: qemu-devel@nongnu.org Cc: "Paolo Bonzini" <pbonzini@redhat.com>, "Fabien Chouteau" <chouteau@adacore.com>, "Viktor Prutyanov" <viktor.prutyanov@phystech.edu>, "Richard Henderson" <rth@twiddle.net>, "Thomas Huth" <thuth@redhat.com>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Laurent Vivier" <laurent@vivier.eu>, "Eduardo Habkost" <ehabkost@redhat.com>, "Andreas Färber" <afaerber@suse.de>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Aurelien Jarno" <aurelien@aurel32.net>, "Jason Wang" <jasowang@redhat.com>, qemu-trivial@nongnu.org, "Laurent Vivier" <lvivier@redhat.com>, "Michael Tokarev" <mjt@tls.msk.ru>, "Peter Maydell" <peter.maydell@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Gerd Hoffmann" <kraxel@redhat.com>, "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Eric Blake" <eblake@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [Qemu-devel] [PULL 10/13] net: Print output of "-net nic, model=help" to stdout instead of stderr Date: Thu, 2 May 2019 20:58:32 +0200 [thread overview] Message-ID: <20190502185835.15185-11-laurent@vivier.eu> (raw) In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> From: Thomas Huth <thuth@redhat.com> 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> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190423160608.7519-1-thuth@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- net/net.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/net.c b/net/net.c index f3a3c5444cc3..2cf5e7646997 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.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Vivier <laurent@vivier.eu> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Jason Wang" <jasowang@redhat.com>, "Michael Tokarev" <mjt@tls.msk.ru>, "Gerd Hoffmann" <kraxel@redhat.com>, qemu-trivial@nongnu.org, "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Laurent Vivier" <lvivier@redhat.com>, "Thomas Huth" <thuth@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Fabien Chouteau" <chouteau@adacore.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Richard Henderson" <rth@twiddle.net>, "Viktor Prutyanov" <viktor.prutyanov@phystech.edu>, "Laurent Vivier" <laurent@vivier.eu>, "Paolo Bonzini" <pbonzini@redhat.com>, "Andreas Färber" <afaerber@suse.de>, "Aurelien Jarno" <aurelien@aurel32.net> Subject: [Qemu-devel] [PULL 10/13] net: Print output of "-net nic, model=help" to stdout instead of stderr Date: Thu, 2 May 2019 20:58:32 +0200 [thread overview] Message-ID: <20190502185835.15185-11-laurent@vivier.eu> (raw) Message-ID: <20190502185832._1FWr4363nVcZCSEW7HIa0Wce4ytSV5hqhYJDkg6mJY@z> (raw) In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> From: Thomas Huth <thuth@redhat.com> 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> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190423160608.7519-1-thuth@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- net/net.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/net.c b/net/net.c index f3a3c5444cc3..2cf5e7646997 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.20.1
next prev parent reply other threads:[~2019-05-02 18:59 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-02 18:58 [Qemu-devel] [PULL 00/13] Trivial branch patches Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 01/13] hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of printf Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 02/13] CODING_STYLE: specify the indent rule for multiline code Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 03/13] CODING_STYLE: indent example code as all others Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 04/13] Clean up includes Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 05/13] doc: fix the configuration path Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 06/13] qom: use object_new_with_type in object_new_with_propv Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 07/13] configure: fix pam test warning Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 08/13] Update configure Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 09/13] Header cleanups Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier [this message] 2019-05-02 18:58 ` [Qemu-devel] [PULL 10/13] net: Print output of "-net nic, model=help" to stdout instead of stderr Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 11/13] Makefile: Let the 'clean' rule remove qemu-ga.exe on Windows hosts Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 12/13] hw/sparc/leon3: Allow load of uImage firmwares Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-02 18:58 ` [Qemu-devel] [PULL 13/13] sockets: avoid string truncation warnings when copying UNIX path Laurent Vivier 2019-05-02 18:58 ` Laurent Vivier 2019-05-03 10:34 ` [Qemu-devel] [PULL 00/13] Trivial branch patches Peter Maydell 2019-05-03 10:34 ` Peter Maydell 2019-05-03 11:03 ` Laurent Vivier 2019-05-03 11:03 ` Laurent Vivier 2019-05-03 11:17 ` Alex Bennée 2019-05-03 11:17 ` Alex Bennée 2019-05-08 14:33 ` Markus Armbruster 2019-05-08 14:46 ` Alex Bennée 2019-05-09 8:32 ` Markus Armbruster 2019-05-09 8:53 ` Peter Maydell 2019-05-10 15:04 ` Markus Armbruster 2019-05-10 16:25 ` Peter Maydell 2019-05-10 16:32 ` Peter Maydell 2019-05-10 16:51 ` Markus Armbruster 2019-05-08 14:48 ` Markus Armbruster
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190502185835.15185-11-laurent@vivier.eu \ --to=laurent@vivier.eu \ --cc=afaerber@suse.de \ --cc=alex.bennee@linaro.org \ --cc=atar4qemu@gmail.com \ --cc=aurelien@aurel32.net \ --cc=berrange@redhat.com \ --cc=chouteau@adacore.com \ --cc=eblake@redhat.com \ --cc=ehabkost@redhat.com \ --cc=jasowang@redhat.com \ --cc=kraxel@redhat.com \ --cc=lvivier@redhat.com \ --cc=marcel.apfelbaum@gmail.com \ --cc=mark.cave-ayland@ilande.co.uk \ --cc=mdroth@linux.vnet.ibm.com \ --cc=mjt@tls.msk.ru \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=philmd@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-trivial@nongnu.org \ --cc=rth@twiddle.net \ --cc=thuth@redhat.com \ --cc=viktor.prutyanov@phystech.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).