[Qemu-devel] [PATCH 5/5] qdev/class: make pci_nic_init() use qdev's device list.

[Gerd Hoffmann <kraxel@redhat.com>]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/pci.c        |   58 +++++++++++++++++++-----------------------------------
 hw/virtio-pci.c |    1 +
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index cc4882e..948611e 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -784,53 +784,37 @@ DeviceState *pci_create(const char *name, const char *devaddr)
     return dev;
 }
 
-static const char * const pci_nic_models[] = {
-    "ne2k_pci",
-    "i82551",
-    "i82557b",
-    "i82559er",
-    "rtl8139",
-    "e1000",
-    "pcnet",
-    "virtio",
-    NULL
-};
-
-static const char * const pci_nic_names[] = {
-    "ne2k_pci",
-    "i82551",
-    "i82557b",
-    "i82559er",
-    "rtl8139",
-    "e1000",
-    "pcnet",
-    "virtio-net-pci",
-    NULL
-};
-
 /* Initialize a PCI NIC.  */
 PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
                         const char *default_devaddr)
 {
     const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr;
+    char buf[256];
     DeviceState *dev;
-    int i;
+    DeviceInfo *info;
+    int ret = 0;
 
-    qemu_check_nic_model_list(nd, pci_nic_models, default_model);
-
-    for (i = 0; pci_nic_models[i]; i++) {
-        if (strcmp(nd->model, pci_nic_models[i]) == 0) {
-            dev = pci_create(pci_nic_names[i], devaddr);
-            if (nd->id)
-                snprintf(dev->id, sizeof(dev->id), "%s", nd->id);
-            dev->nd = nd;
-            qdev_init(dev);
-            nd->private = dev;
-            return DO_UPCAST(PCIDevice, qdev, dev);
+    if (!nd->model)
+        nd->model = strdup(default_model);
+
+    info = qdev_find_info(&pci_bus_info, nd->model, DEV_CLASS_NETWORK);
+    if (!info) {
+        if (strcmp(nd->model, "?") != 0) {
+            fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model);
+            ret = 1;
         }
+        qdev_list_devices(&pci_bus_info, DEV_CLASS_NETWORK, buf, sizeof(buf));
+        fprintf(stderr, "qemu: Supported NIC models: %s\n", buf);
+        exit(ret);
     }
 
-    return NULL;
+    dev = pci_create(info->name, devaddr);
+    if (nd->id)
+        snprintf(dev->id, sizeof(dev->id), "%s", nd->id);
+    dev->nd = nd;
+    qdev_init(dev);
+    nd->private = dev;
+    return DO_UPCAST(PCIDevice, qdev, dev);
 }
 
 typedef struct {
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index d28d7b3..0b3f41f 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -473,6 +473,7 @@ static PCIDeviceInfo virtio_info[] = {
         .init      = virtio_blk_init_pci,
     },{
         .qdev.name  = "virtio-net-pci",
+        .qdev.alias = "virtio",
         .qdev.size  = sizeof(VirtIOPCIProxy),
         .qdev.class = DEV_CLASS_NETWORK,
         .init       = virtio_net_init_pci,
-- 
1.6.2.5