From 0148fde54c2478ea8a47c8dbfe4c0fb8bda4d996 Mon Sep 17 00:00:00 2001
From: Luiz Capitulino <lcapitulino@redhat.com>
Date: Thu, 24 Sep 2009 11:16:01 -0300
Subject: [PATCH] Fix exit on 'pci_add' Monitor command

If the user issues one of the following commands to the Monitor:

pci_add pci_addr=auto nic model=None
pci_add pci_addr=auto nic model=?

QEMU will exit, because the function used to perform sanity
checks (qemu_check_nic_model_list()) exits on error.

This function is used by the startup code, where it makes
sense to exit on error, but in the Monitor it doesn't.

Changing qemu_check_nic_model_list() to not exit on error
is not possible though, as it's used by the board init
code (the PC one), where all board specific code must have
void return.

The way I've chosen to fix this was to introduce a new function
called pci_nic_supported(), which checks if the NIC is supported
and returns true or false accordingly.

The new function is used only by the Monitor, it performs the
necessary check and returns an error in case the NIC is not
supported, thus qemu_check_nic_model_list()'s exit is never trigged.

The following should be observed:

1. Only the specified NIC is checked, the default one is assumed
to be supported

2. The NIC query command (model=?) won't work with pci_add, the
right way to do this with the Monitor is to add a new command

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/pci-hotplug.c |  4 ++++
 hw/pci.c         | 11 +++++++++++
 hw/pci.h         |  1 +
 3 files changed, 16 insertions(+)

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index f3dc42103d..89974a0668 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -46,6 +46,10 @@ 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 c46410aae3..c656bd047c 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -806,6 +806,17 @@ 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 caba5c8518..ba748ff9cd 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -252,6 +252,7 @@ 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);
 void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len);