From: David Woodhouse <dwmw2@infradead.org>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paul Durrant" <paul@xen.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Jason Wang" <jasowang@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
qemu-block@nongnu.org, xen-devel@lists.xenproject.org,
kvm@vger.kernel.org, "Bernhard Beschow" <shentey@gmail.com>,
"Joel Upham" <jupham125@gmail.com>
Subject: [PATCH v3 23/28] net: report list of available models according to platform
Date: Wed, 25 Oct 2023 15:50:37 +0100 [thread overview]
Message-ID: <20231025145042.627381-24-dwmw2@infradead.org> (raw)
In-Reply-To: <20231025145042.627381-1-dwmw2@infradead.org>
From: David Woodhouse <dwmw@amazon.co.uk>
By noting the models for which a configuration was requested, we can give
the user an accurate list of which NIC models were actually available on
the platform/configuration that was otherwise chosen.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
net/net.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/net/net.c b/net/net.c
index f8b4973a1e..807220e630 100644
--- a/net/net.c
+++ b/net/net.c
@@ -75,6 +75,8 @@ typedef QSIMPLEQ_HEAD(, NetdevQueueEntry) NetdevQueue;
static NetdevQueue nd_queue = QSIMPLEQ_HEAD_INITIALIZER(nd_queue);
+static GHashTable *nic_model_help;
+
/***********************************************************/
/* network device redirectors */
@@ -1072,12 +1074,94 @@ static int net_init_nic(const Netdev *netdev, const char *name,
return idx;
}
+static gboolean add_nic_result(gpointer key, gpointer value, gpointer user_data)
+{
+ GPtrArray *results = user_data;
+ GPtrArray *alias_list = value;
+ const char *model = key;
+ char *result;
+
+ if (!alias_list) {
+ result = g_strdup(model);
+ } else {
+ GString *result_str = g_string_new(model);
+ int i;
+
+ g_string_append(result_str, " (aka ");
+ for (i = 0; i < alias_list->len; i++) {
+ if (i) {
+ g_string_append(result_str, ", ");
+ }
+ g_string_append(result_str, alias_list->pdata[i]);
+ }
+ g_string_append(result_str, ")");
+ result = result_str->str;
+ g_string_free(result_str, false);
+ g_ptr_array_unref(alias_list);
+ }
+ g_ptr_array_add(results, result);
+ return true;
+}
+
+static int model_cmp(char **a, char **b)
+{
+ return strcmp(*a, *b);
+}
+
+static void show_nic_models(void)
+{
+ GPtrArray *results = g_ptr_array_new();
+ int i;
+
+ g_hash_table_foreach_remove(nic_model_help, add_nic_result, results);
+ g_ptr_array_sort(results, (GCompareFunc)model_cmp);
+
+ printf("Available NIC models for this configuration:\n");
+ for (i = 0 ; i < results->len; i++) {
+ printf("%s\n", (char *)results->pdata[i]);
+ }
+ g_hash_table_unref(nic_model_help);
+ nic_model_help = NULL;
+}
+
+static void add_nic_model_help(const char *model, const char *alias)
+{
+ GPtrArray *alias_list = NULL;
+
+ if (g_hash_table_lookup_extended(nic_model_help, model, NULL,
+ (gpointer *)&alias_list)) {
+ /* Already exists, no alias to add: return */
+ if (!alias) {
+ return;
+ }
+ if (alias_list) {
+ /* Check if this alias is already in the list. Add if not. */
+ if (!g_ptr_array_find_with_equal_func(alias_list, alias,
+ g_str_equal, NULL)) {
+ g_ptr_array_add(alias_list, g_strdup(alias));
+ }
+ return;
+ }
+ }
+ /* Either this model wasn't in the list already, or a first alias added */
+ if (alias) {
+ alias_list = g_ptr_array_new();
+ g_ptr_array_set_free_func(alias_list, g_free);
+ g_ptr_array_add(alias_list, g_strdup(alias));
+ }
+ g_hash_table_replace(nic_model_help, g_strdup(model), alias_list);
+}
+
NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
const char *alias)
{
NICInfo *nd;
int i;
+ if (nic_model_help) {
+ add_nic_model_help(typename, alias);
+ }
+
for (i = 0; i < nb_nics; i++) {
nd = &nd_table[i];
@@ -1591,6 +1675,10 @@ void net_check_clients(void)
NetClientState *nc;
int i;
+ if (nic_model_help) {
+ show_nic_models();
+ exit(0);
+ }
net_hub_check_clients();
QTAILQ_FOREACH(nc, &net_clients, next) {
@@ -1670,6 +1758,12 @@ 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);
+ return 0;
+ }
+
/* Create an ID if the user did not specify one */
nd_id = g_strdup(qemu_opts_id(opts));
if (!nd_id) {
--
2.40.1
next prev parent reply other threads:[~2023-10-25 14:53 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 14:50 [PATCH v3 00/28] Get Xen PV shim running in QEMU, add net & console David Woodhouse
2023-10-25 14:50 ` [PATCH v3 01/28] i386/xen: Don't advertise XENFEAT_supervisor_mode_kernel David Woodhouse
2023-10-25 14:50 ` [PATCH v3 02/28] i386/xen: fix per-vCPU upcall vector for Xen emulation David Woodhouse
2023-10-25 14:50 ` [PATCH v3 03/28] hw/xen: select kernel mode for per-vCPU event channel upcall vector David Woodhouse
2023-10-25 14:50 ` [PATCH v3 04/28] hw/xen: don't clear map_track[] in xen_gnttab_reset() David Woodhouse
2023-10-25 14:50 ` [PATCH v3 05/28] hw/xen: fix XenStore watch delivery to guest David Woodhouse
2023-10-27 7:15 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 06/28] hw/xen: take iothread mutex in xen_evtchn_reset_op() David Woodhouse
2023-10-27 7:20 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 07/28] hw/xen: use correct default protocol for xen-block on x86 David Woodhouse
2023-10-27 7:22 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 08/28] i386/xen: Ignore VCPU_SSHOTTMR_future flag in set_singleshot_timer() David Woodhouse
2023-10-27 7:23 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 09/28] hw/xen: Clean up event channel 'type_val' handling to use union David Woodhouse
2023-10-25 14:50 ` [PATCH v3 10/28] include: update Xen public headers to Xen 4.17.2 release David Woodhouse
2023-10-25 14:50 ` [PATCH v3 11/28] i386/xen: advertise XEN_HVM_CPUID_UPCALL_VECTOR in CPUID David Woodhouse
2023-10-25 14:50 ` [PATCH v3 12/28] hw/xen: populate store frontend nodes with XenStore PFN/port David Woodhouse
2023-10-25 14:50 ` [PATCH v3 13/28] hw/xen: automatically assign device index to block devices David Woodhouse
2023-10-27 7:30 ` Durrant, Paul
2023-10-27 8:45 ` David Woodhouse
2023-10-27 9:01 ` Durrant, Paul
2023-10-27 10:25 ` David Woodhouse
2023-10-27 10:32 ` Durrant, Paul
2023-10-27 12:02 ` David Woodhouse
2023-10-25 14:50 ` [PATCH v3 14/28] hw/xen: add get_frontend_path() method to XenDeviceClass David Woodhouse
2023-10-27 7:31 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 15/28] hw/xen: do not repeatedly try to create a failing backend device David Woodhouse
2023-10-25 14:50 ` [PATCH v3 16/28] hw/xen: update Xen console to XenDevice model David Woodhouse
2023-10-25 14:50 ` [PATCH v3 17/28] hw/xen: add support for Xen primary console in emulated mode David Woodhouse
2023-10-27 7:44 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 18/28] hw/xen: only remove peers of PCI NICs on unplug David Woodhouse
2023-10-27 8:29 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 19/28] hw/xen: update Xen PV NIC to XenDevice model David Woodhouse
2023-10-27 8:42 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 20/28] net: do not delete nics in net_cleanup() David Woodhouse
2023-10-27 8:44 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 21/28] xen-platform: unplug AHCI disks David Woodhouse
2023-10-27 9:08 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 22/28] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info() David Woodhouse
2023-10-27 9:25 ` [PATCH v3 22/28] net: add qemu_{configure,create}_nic_device(), qemu_find_nic_info() Durrant, Paul
2023-10-25 14:50 ` David Woodhouse [this message]
2023-10-27 9:31 ` [PATCH v3 23/28] net: report list of available models according to platform Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 24/28] net: add qemu_create_nic_bus_devices() David Woodhouse
2023-10-27 9:42 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 25/28] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot() David Woodhouse
2023-10-27 9:46 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 26/28] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices() David Woodhouse
2023-10-27 9:48 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 27/28] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs David Woodhouse
2023-10-27 9:52 ` Durrant, Paul
2023-10-25 14:50 ` [PATCH v3 28/28] docs: update Xen-on-KVM documentation David Woodhouse
2023-10-25 18:20 ` Eric Blake
2023-10-25 18:26 ` David Woodhouse
2023-10-25 18:56 ` Andrew Cooper
2023-10-25 19:02 ` David Woodhouse
2023-10-26 8:26 ` Kevin Wolf
2023-10-26 9:25 ` David Woodhouse
2023-10-26 16:25 ` David Woodhouse
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=20231025145042.627381-24-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=anthony.perard@citrix.com \
--cc=eduardo@habkost.net \
--cc=hreitz@redhat.com \
--cc=jasowang@redhat.com \
--cc=jupham125@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=shentey@gmail.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.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 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).