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_chrp.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/ppc_chrp.c')
| -rw-r--r-- | hw/ppc_chrp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index d57e286..7625cd1 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -265,11 +265,10 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, escc_mem_index = escc_init(0x80013000, dummy_irq[4], 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"); + if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { fprintf(stderr, "qemu: too many IDE bus\n"); exit(1); |