Revert "Fix exit on 'pci_add' Monitor command"

This reverts commit 0148fde54c2478ea8a47c8dbfe4c0fb8bda4d996.

As requested by Luiz.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index f7813866742746735b4105061b564ab1ba7ec202..44f6a2f9bb32e049e819538015c34f28f1dc1e67 100644 (file)
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -46,10 +46,6 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
         monitor_printf(mon, "Parameter addr not supported\n");
         return NULL;
     }
-
-    if (nd_table[ret].model && !pci_nic_supported(nd_table[ret].model))
-        return NULL;
-
     return pci_nic_init(&nd_table[ret], "rtl8139", devaddr);
 }
 

diff --git a/hw/pci.c b/hw/pci.c
index ade778f16614e9c9c1645bea2b6201d073b9dfd6..bd65db223926c80dac19790e4e04f86ee61e2209 100644 (file)
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -833,17 +833,6 @@ static const char * const pci_nic_names[] = {
     NULL
 };
 
-int pci_nic_supported(const char *model)
-{
-    int i;
-
-    for (i = 0; pci_nic_names[i]; i++)
-        if (strcmp(model, pci_nic_names[i]) == 0)
-            return 1;
-
-    return 0;
-}
-
 /* Initialize a PCI NIC.  */
 PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
                         const char *default_devaddr)

diff --git a/hw/pci.h b/hw/pci.h
index b867e211183941b156b0ffcedcfe46bccfd2cd38..93f93fb87566e206a289f84f19dcb91c4150d713 100644 (file)
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -253,7 +253,6 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name,
                          pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
                          void *irq_opaque, int devfn_min, int nirq);
 
-int pci_nic_supported(const char *model);
 PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
                         const char *default_devaddr);
 PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,