[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/10] net: Restore printing of the help text with "-nic help"
From: |
Jason Wang |
Subject: |
[PULL 02/10] net: Restore printing of the help text with "-nic help" |
Date: |
Tue, 14 Feb 2023 14:11:32 +0800 |
From: Thomas Huth <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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/net.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/net/net.c b/net/net.c
index 476a4b7..e8cd95c 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1542,8 +1542,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.7.4
- [PULL 00/10] Net patches, Jason Wang, 2023/02/14
- [PULL 01/10] net: Move the code to collect available NIC models to a separate function, Jason Wang, 2023/02/14
- [PULL 02/10] net: Restore printing of the help text with "-nic help",
Jason Wang <=
- [PULL 03/10] net: Replace "Supported NIC models" with "Available NIC models", Jason Wang, 2023/02/14
- [PULL 04/10] hw/net/lan9118: log [read|write]b when mode_16bit is enabled rather than abort, Jason Wang, 2023/02/14
- [PULL 05/10] hw/net/vmxnet3: allow VMXNET3_MAX_MTU itself as a value, Jason Wang, 2023/02/14
- [PULL 06/10] net: Increase L2TPv3 buffer to fit jumboframes, Jason Wang, 2023/02/14
- [PULL 07/10] vmnet: stop recieving events when VM is stopped, Jason Wang, 2023/02/14
- [PULL 08/10] hw/net/can/xlnx-zynqmp-can: fix assertion failures in transfer_fifo(), Jason Wang, 2023/02/14
- [PULL 09/10] net: stream: add a new option to automatically reconnect, Jason Wang, 2023/02/14
- [PULL 10/10] vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check, Jason Wang, 2023/02/14
- Re: [PULL 00/10] Net patches, Peter Maydell, 2023/02/14