aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-10-05 15:48:22 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-06 14:36:09 -0500
commite52eb611dbfac45ec3209f3549503aa4ba2ca2ce (patch)
tree8d67c1f7f36bec5bdbfb0889f2a50032c248e0da /hw
parent0ca9f8a42d64571d3310ea25a63588d77efd58c3 (diff)
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/pci-hotplug.c4
-rw-r--r--hw/pci.c11
-rw-r--r--hw/pci.h1
3 files changed, 0 insertions, 16 deletions
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index f781386674..44f6a2f9bb 100644
--- 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 ade778f166..bd65db2239 100644
--- 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 b867e21118..93f93fb875 100644
--- 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,