gwj / at91sam9263 · Commits

Commit eefb4091d29d8a32f02e004d50028201926d23f0

Authored by aliguori
1 parent 771f1339

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/trunk@7145 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
hw/pci-hotplug.c
  View file @eefb409
... ... @@ -37,10 +37,10 @@ static PCIDevice *qemu_pci_hot_add_nic(PCIBus *pci_bus, const char *opts)
37 37 {
38 38 int ret;
39 39  
40   - ret = net_client_init ("nic", opts);
41   - if (ret < 0 || !nd_table[ret].model)
  40 + ret = net_client_init("nic", opts);
  41 + if (ret < 0)
42 42 return NULL;
43   - return pci_nic_init (pci_bus, &nd_table[ret], -1, "rtl8139");
  43 + return pci_nic_init(pci_bus, &nd_table[ret], -1, "rtl8139");
44 44 }
45 45  
46 46 void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts)
... ...