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/ppc440_bamboo.c | |
| parent | 0ae18ceeaaa2c1749e742c4b112f6c3bf0896408 (diff) | |
| download | qemu-cb457d7679840b95de361c42921e601bd224ecf5.tar.gz | |
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/ppc440_bamboo.c')
| -rw-r--r-- | hw/ppc440_bamboo.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index a6fc75823c..bc8a47b468 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -90,7 +90,6 @@ static void bamboo_init(ram_addr_t ram_size, int vga_ram_size, const char *cpu_model) { unsigned int pci_irq_nrs[4] = { 28, 27, 26, 25 }; - NICInfo *nd; PCIBus *pcibus; CPUState *env; uint64_t elf_entry; @@ -118,13 +117,9 @@ static void bamboo_init(ram_addr_t ram_size, int vga_ram_size, /* Register network interfaces. */ for (i = 0; i < nb_nics; i++) { - nd = &nd_table[i]; - if (!nd->model) { - /* There are no PCI NICs on the Bamboo board, but there are - * PCI slots, so we can pick model whatever we want. */ - nd->model = "e1000"; - } - pci_nic_init(pcibus, nd, -1); + /* There are no PCI NICs on the Bamboo board, but there are + * PCI slots, so we can pick whatever default model we want. */ + pci_nic_init(pcibus, &nd_table[i], -1, "e1000"); } } |