diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 18:06:34 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 18:06:34 +0000 |
| commit | 8cacc9ad14759908bed08faad7a4e78f3765a22d (patch) | |
| tree | 2772365ed94d72da9d2af45c1ee37d91235cac47 | |
| parent | 76dcd4921c512c591265041961f420ce967c1fb6 (diff) | |
| download | qemu-8cacc9ad14759908bed08faad7a4e78f3765a22d.tar.gz | |
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 <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7155 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/pci-hotplug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index fa3a5e0932..895ba047a9 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -37,10 +37,10 @@ static PCIDevice *qemu_pci_hot_add_nic(PCIBus *pci_bus, const char *opts) { 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) |