mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Reinstate '-net nic, model=help' output as documented in man page

Browse Source 
While refactoring the NIC initialization code, I broke '-net nic,model=help'
which no longer outputs a list of available NIC models.

Fixes: 2cdeca04ad ("net: report list of available models according to platform")
Cc: qemu-stable@nongnu.org
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Jason Wang <jasowang@redhat.com>
(cherry picked from commit 64f75f57f9)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
David Woodhouse 2024-07-09 13:34:44 +01:00 committed by Michael Tokarev
parent 6ce7791497
commit 8636d5a32c
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net/net.c
View File

@ -1150,6 +1150,21 @@ NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
return NULL;
}
static bool is_nic_model_help_option(const char *model)
{
if (model && is_help_option(model)) {
/*
* Trigger the help output by instantiating the hash table which
* will gather tha available models as they get registered.
*/
if (!nic_model_help) {
nic_model_help = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
}
return true;
}
return false;
}
/* "I have created a device. Please configure it if you can" */
bool qemu_configure_nic_device(DeviceState *dev, bool match_default,
@ -1733,6 +1748,12 @@ void net_check_clients(void)
static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
{
const char *model = qemu_opt_get_del(opts, "model");
if (is_nic_model_help_option(model)) {
return 0;
}
return net_client_init(opts, false, errp);
}
@ -1789,9 +1810,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
memset(ni, 0, sizeof(*ni));
ni->model = qemu_opt_get_del(opts, "model");
if (!nic_model_help && !g_strcmp0(ni->model, "help")) {
nic_model_help = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
if (is_nic_model_help_option(ni->model)) {
return 0;
}