[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/3] net: allow using any PCI NICs in -net or -n
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH 2/3] net: allow using any PCI NICs in -net or -nic |
Date: |
Thu, 8 Mar 2018 15:53:44 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 |
On 03/08/2018 02:28 PM, Paolo Bonzini wrote:
> Remove the hard-coded list of PCI NIC names; instead, fill an array
> using all PCI devices listed under DEVICE_CATEGORY_NETWORK. Keep
> the old shortcut "virtio" for virtio-net-pci.
>
> Suggested-by: Thomas Huth <address@hidden>
> Cc: Jason Wang <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> hw/pci/pci.c | 61
> ++++++++++++++++++++++++++++++------------------------------
> 1 file changed, 30 insertions(+), 31 deletions(-)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 2174c254eb..67a3f72bd6 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -1815,49 +1815,48 @@ PciInfoList *qmp_query_pci(Error **errp)
> return head;
> }
>
> -static const char * const pci_nic_models[] = {
> - "ne2k_pci",
> - "i82551",
> - "i82557b",
> - "i82559er",
> - "rtl8139",
> - "e1000",
> - "pcnet",
> - "virtio",
> - "sungem",
> - NULL
> -};
> -
> -static const char * const pci_nic_names[] = {
> - "ne2k_pci",
> - "i82551",
> - "i82557b",
> - "i82559er",
> - "rtl8139",
> - "e1000",
> - "pcnet",
> - "virtio-net-pci",
> - "sungem",
> - NULL
> -};
> -
> /* Initialize a PCI NIC. */
> PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
> const char *default_model,
> const char *default_devaddr)
> {
> const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr;
> + GSList *list;
> + GPtrArray *pci_nic_models;
> PCIBus *bus;
> PCIDevice *pci_dev;
> DeviceState *dev;
> int devfn;
> int i;
>
> - if (qemu_show_nic_models(nd->model, pci_nic_models)) {
> + if (nd->model && !strcmp(nd->model, "virtio")) {
> + g_free(nd->model);
> + nd->model = g_strdup("virtio-net-pci");
> + }
> +
> + list = object_class_get_list_sorted(TYPE_PCI_DEVICE, false);
> + pci_nic_models = g_ptr_array_new();
> + while (list) {
> + DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, list->data,
> + TYPE_DEVICE);
> + GSList *next;
> + if (test_bit(DEVICE_CATEGORY_NETWORK, dc->categories) &&
> + dc->user_creatable) {
> + const char *name = object_class_get_name(list->data);
> + g_ptr_array_add(pci_nic_models, (gpointer)name);
> + }
> + next = list->next;
> + g_slist_free_1(list);
> + list = next;
> + }
> + g_ptr_array_add(pci_nic_models, NULL);
> +
> + if (qemu_show_nic_models(nd->model, (const char
> **)pci_nic_models->pdata)) {
> exit(0);
> }
>
> - i = qemu_find_nic_model(nd, pci_nic_models, default_model);
> + i = qemu_find_nic_model(nd, (const char **)pci_nic_models->pdata,
> + default_model);
> if (i < 0) {
> exit(1);
> }
> @@ -1865,15 +1864,15 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus
> *rootbus,
> bus = pci_get_bus_devfn(&devfn, rootbus, devaddr);
> if (!bus) {
> error_report("Invalid PCI device address %s for device %s",
> - devaddr, pci_nic_names[i]);
> + devaddr, nd->model);
> exit(1);
> }
>
> - pci_dev = pci_create(bus, devfn, pci_nic_names[i]);
> + pci_dev = pci_create(bus, devfn, nd->model);
> dev = &pci_dev->qdev;
> qdev_set_nic_properties(dev, nd);
> qdev_init_nofail(dev);
> -
> + g_ptr_array_free(pci_nic_models, true);
> return pci_dev;
> }
>
>