From e52eb611dbfac45ec3209f3549503aa4ba2ca2ce Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Mon, 5 Oct 2009 15:48:22 -0500 Subject: [PATCH] Revert "Fix exit on 'pci_add' Monitor command" This reverts commit 0148fde54c2478ea8a47c8dbfe4c0fb8bda4d996. As requested by Luiz. Signed-off-by: Anthony Liguori --- hw/pci-hotplug.c | 4 ---- hw/pci.c | 11 ----------- hw/pci.h | 1 - 3 files changed, 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,