From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Jason Wang <jasowang@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
pbonzini@redhat.com,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Claudio Fontana" <cfontana@suse.de>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v2 2/3] net: Restore printing of the help text with "-nic help"
Date: Thu, 10 Nov 2022 13:52:23 +0100 [thread overview]
Message-ID: <20221110125224.99596-3-thuth@redhat.com> (raw)
In-Reply-To: <20221110125224.99596-1-thuth@redhat.com>
Running QEMU with "-nic help" used to work in QEMU 5.2 and earlier versions
(it showed the available netdev backends), but this feature got broken during
some refactoring in version 6.0. Let's restore the old behavior, and while
we're at it, let's also print the available NIC models here now since this
option can be used to configure both, netdev backend and model in one go.
Fixes: ad6f932fe8 ("net: do not exit on "netdev_add help" monitor command")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
net/net.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/net/net.c b/net/net.c
index 49cced691f..cdd3ebc515 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1569,8 +1569,18 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
const char *type;
type = qemu_opt_get(opts, "type");
- if (type && g_str_equal(type, "none")) {
- return 0; /* Nothing to do, default_net is cleared in vl.c */
+ if (type) {
+ if (g_str_equal(type, "none")) {
+ return 0; /* Nothing to do, default_net is cleared in vl.c */
+ }
+ if (is_help_option(type)) {
+ GPtrArray *nic_models = qemu_get_nic_models(TYPE_DEVICE);
+ show_netdevs();
+ printf("\n");
+ qemu_show_nic_models(type, (const char **)nic_models->pdata);
+ g_ptr_array_free(nic_models, true);
+ exit(0);
+ }
}
idx = nic_get_free_idx();
--
2.31.1
next prev parent reply other threads:[~2022-11-10 12:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 12:52 [PATCH v2 0/3] Fix the "-nic help" option Thomas Huth
2022-11-10 12:52 ` [PATCH v2 1/3] net: Move the code to collect available NIC models to a separate function Thomas Huth
2022-11-10 12:52 ` Thomas Huth [this message]
2022-11-10 12:52 ` [PATCH v2 3/3] net: Replace "Supported NIC models" with "Available NIC models" Thomas Huth
2022-12-15 15:23 ` [PATCH v2 0/3] Fix the "-nic help" option Thomas Huth
2022-12-16 7:38 ` Jason Wang
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=20221110125224.99596-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=cfontana@suse.de \
--cc=jasowang@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.