diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 19:47:10 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 19:47:10 +0000 |
| commit | cb457d7679840b95de361c42921e601bd224ecf5 (patch) | |
| tree | af60a521573a5250d95ba671f69bea12cb49baa0 /hw/versatilepb.c | |
| parent | 0ae18ceeaaa2c1749e742c4b112f6c3bf0896408 (diff) | |
| download | qemu-cb457d7679840b95de361c42921e601bd224ecf5.zip qemu-cb457d7679840b95de361c42921e601bd224ecf5.tar.gz qemu-cb457d7679840b95de361c42921e601bd224ecf5.tar.bz2 | |
Make pci_nic_init() use qemu_setup_nic_model() (Mark McLoughlin)
Add a table of PCI NIC models to pass to qemu_setup_nic_model().
While we're at it, also add a corresponding table of NIC init
functions.
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@6287 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/versatilepb.c')
| -rw-r--r-- | hw/versatilepb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 38c040d..267aa42 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -199,9 +199,7 @@ static void versatile_init(ram_addr_t ram_size, int vga_ram_size, smc91c111_init(nd, 0x10010000, sic[25]); done_smc = 1; } else { - if (!nd->model) - nd->model = "rtl8139"; - pci_nic_init(pci_bus, nd, -1); + pci_nic_init(pci_bus, nd, -1, "rtl8139"); } } if (usb_enabled) { |