qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Woodhouse <dwmw2@infradead.org>
To: qemu-devel@nongnu.org
Subject: [PULL 02/47] net: report list of available models according to platform
Date: Thu,  1 Feb 2024 16:43:27 +0000	[thread overview]
Message-ID: <20240201164412.785520-3-dwmw2@infradead.org> (raw)
In-Reply-To: <20240201164412.785520-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>
Reviewed-by: Paul Durrant <paul@xen.org>
---
 net/net.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/net/net.c b/net/net.c
index aeb7f573fc..962904eaef 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 */
 
@@ -1087,12 +1089,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];
 
@@ -1606,6 +1690,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) {
@@ -1685,6 +1773,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.43.0



  parent reply	other threads:[~2024-02-01 16:58 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-01 16:43 [PULL 00/47] nic-config.for-upstream queue David Woodhouse
2024-02-01 16:43 ` [PULL 01/47] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info() David Woodhouse
2024-02-01 16:43 ` David Woodhouse [this message]
2024-02-01 16:43 ` [PULL 03/47] net: add qemu_create_nic_bus_devices() David Woodhouse
2024-02-01 16:43 ` [PULL 04/47] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot() David Woodhouse
2024-02-01 16:43 ` [PULL 05/47] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices() David Woodhouse
2024-02-01 16:43 ` [PULL 06/47] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs David Woodhouse
2024-02-01 16:43 ` [PULL 07/47] hw/alpha/dp264: use pci_init_nic_devices() David Woodhouse
2024-02-01 16:43 ` [PULL 08/47] hw/arm/sbsa-ref: " David Woodhouse
2024-02-01 16:43 ` [PULL 09/47] hw/arm/virt: " David Woodhouse
2024-02-01 16:43 ` [PULL 10/47] hw/hppa: " David Woodhouse
2024-02-01 16:43 ` [PULL 11/47] hw/loongarch: " David Woodhouse
2024-02-01 16:43 ` [PULL 12/47] hw/mips/fuloong2e: " David Woodhouse
2024-02-01 16:43 ` [PULL 13/47] hw/mips/malta: " David Woodhouse
2024-02-01 16:43 ` [PULL 14/47] hw/mips/loongson3_virt: " David Woodhouse
2024-02-01 16:43 ` [PULL 15/47] hw/ppc/prep: " David Woodhouse
2024-02-01 16:43 ` [PULL 16/47] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices() David Woodhouse
2024-02-01 16:43 ` [PULL 17/47] hw/ppc: use pci_init_nic_devices() David Woodhouse
2024-02-01 16:43 ` [PULL 18/47] hw/sh4/r2d: " David Woodhouse
2024-02-01 16:43 ` [PULL 19/47] hw/sparc64/sun4u: " David Woodhouse
2024-02-01 16:43 ` [PULL 20/47] hw/xtensa/virt: " David Woodhouse
2024-02-01 16:43 ` [PULL 21/47] hw/arm/allwinner: use qemu_configure_nic_device() David Woodhouse
2024-02-01 16:43 ` [PULL 22/47] hw/arm/aspeed: " David Woodhouse
2024-02-01 16:43 ` [PULL 23/47] hw/arm/exynos4: use qemu_create_nic_device() David Woodhouse
2024-02-01 16:43 ` [PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device() David Woodhouse
2024-02-01 16:43 ` [PULL 25/47] hw/net/smc91c111: " David Woodhouse
2024-02-01 16:43 ` [PULL 26/47] hw/net/lan9118: " David Woodhouse
2024-02-01 16:43 ` [PULL 27/47] hw/arm/highbank: use qemu_create_nic_device() David Woodhouse
2024-02-01 16:43 ` [PULL 28/47] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases David Woodhouse
2024-02-01 16:43 ` [PULL 29/47] hw/arm/stellaris: use qemu_find_nic_info() David Woodhouse
2024-02-01 16:43 ` [PULL 30/47] hw/arm: use qemu_configure_nic_device() David Woodhouse
2024-02-01 16:43 ` [PULL 31/47] hw/net/etraxfs-eth: " David Woodhouse
2024-02-01 16:43 ` [PULL 32/47] hw/m68k/mcf5208: use qemu_create_nic_device() David Woodhouse
2024-02-01 16:43 ` [PULL 33/47] hw/m68k/q800: use qemu_find_nic_info() David Woodhouse
2024-02-01 16:43 ` [PULL 34/47] hw/microblaze: use qemu_configure_nic_device() David Woodhouse
2024-02-01 16:44 ` [PULL 35/47] hw/mips/mipssim: use qemu_create_nic_device() David Woodhouse
2024-02-01 16:44 ` [PULL 36/47] hw/mips/jazz: use qemu_find_nic_info() David Woodhouse
2024-02-01 16:44 ` [PULL 37/47] hw/net/lasi_i82596: Re-enable build David Woodhouse
2024-02-01 16:44 ` [PULL 38/47] hw/net/lasi_i82596: use qemu_create_nic_device() David Woodhouse
2024-02-01 16:44 ` [PULL 39/47] hw/openrisc/openrisc_sim: " David Woodhouse
2024-02-01 16:44 ` [PULL 40/47] hw/riscv: use qemu_configure_nic_device() David Woodhouse
2024-02-01 16:44 ` [PULL 41/47] hw/s390x/s390-virtio-ccw: use qemu_create_nic_device() David Woodhouse
2024-02-01 16:44 ` [PULL 42/47] hw/sparc/sun4m: use qemu_find_nic_info() David Woodhouse
2024-02-01 16:44 ` [PULL 43/47] hw/xtensa/xtfpga: use qemu_create_nic_device() David Woodhouse
2024-02-01 16:44 ` [PULL 44/47] net: remove qemu_check_nic_model() David Woodhouse
2024-02-01 16:44 ` [PULL 45/47] hw/pci: remove pci_nic_init_nofail() David Woodhouse
2024-02-01 16:44 ` [PULL 46/47] net: remove qemu_show_nic_models(), qemu_find_nic_model() David Woodhouse
2024-02-01 16:44 ` [PULL 47/47] net: make nb_nics and nd_table[] static in net/net.c David Woodhouse
2024-02-02 15:32 ` [PULL 00/47] nic-config.for-upstream queue Peter Maydell
2024-02-02 15:36   ` David Woodhouse
2024-02-02 15:40     ` Peter Maydell
2024-02-05  6:56       ` Thomas Huth
2024-02-05 10:11         ` Thomas Huth
2024-02-05 10:55           ` Peter Maydell
2024-02-02 16:01   ` David Woodhouse
2024-02-02 16:15     ` Peter Maydell
2024-02-02 17:01       ` 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=20240201164412.785520-3-dwmw2@infradead.org \
    --to=dwmw2@infradead.org \
    --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 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).