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/ppc_oldworld.c | |
| parent | Check NIC model in some NIC init functions (Mark McLoughlin) (diff) | |
| download | qemu-kvm-cb457d7679840b95de361c42921e601bd224ecf5.tar.gz qemu-kvm-cb457d7679840b95de361c42921e601bd224ecf5.tar.bz2 qemu-kvm-cb457d7679840b95de361c42921e601bd224ecf5.zip | |
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/ppc_oldworld.c')
| -rw-r--r-- | hw/ppc_oldworld.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 7ae555db7..cf8b24f58 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -307,11 +307,8 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, escc_mem_index = escc_init(0x80013000, pic[0x10], serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); - for(i = 0; i < nb_nics; i++) { - if (!nd_table[i].model) - nd_table[i].model = "ne2k_pci"; - pci_nic_init(pci_bus, &nd_table[i], -1); - } + for(i = 0; i < nb_nics; i++) + pci_nic_init(pci_bus, &nd_table[i], -1, "ne2k_pci"); /* First IDE channel is a CMD646 on the PCI bus */ |