[Qemu-devel] [7155] Don't fail PCI hotplug if no NIC model is supplied (Mark McLoughlin)

[Anthony Liguori]

Revision: 7155
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7155
Author:   aliguori
Date:     2009-04-17 18:06:34 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
Don't fail PCI hotplug if no NIC model is supplied (Mark McLoughlin)

It's perfectly fine to not supply a NIC model when adding
a new NIC - we supply the default model to pci_nic_init()
and it uses that if one wasn't explicitly supplied.

Signed-off-by: Mark McLoughlin <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    branches/stable_0_10/hw/pci-hotplug.c

Modified: branches/stable_0_10/hw/pci-hotplug.c
===================================================================
--- branches/stable_0_10/hw/pci-hotplug.c       2009-04-17 18:06:31 UTC (rev 
7154)
+++ branches/stable_0_10/hw/pci-hotplug.c       2009-04-17 18:06:34 UTC (rev 
7155)
@@ -37,10 +37,10 @@
 {
     int ret;
 
-    ret = net_client_init ("nic", opts);
-    if (ret < 0 || !nd_table[ret].model)
+    ret = net_client_init("nic", opts);
+    if (ret < 0)
         return NULL;
-    return pci_nic_init (pci_bus, &nd_table[ret], -1, "rtl8139");
+    return pci_nic_init(pci_bus, &nd_table[ret], -1, "rtl8139");
 }
 
 void drive_hot_add(const char *pci_addr, const char *opts)