summaryrefslogtreecommitdiff
path: root/hw/r2d.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-13 19:47:10 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-13 19:47:10 +0000
commitcb457d7679840b95de361c42921e601bd224ecf5 (patch)
treeaf60a521573a5250d95ba671f69bea12cb49baa0 /hw/r2d.c
parent0ae18ceeaaa2c1749e742c4b112f6c3bf0896408 (diff)
downloadqemu-cb457d7679840b95de361c42921e601bd224ecf5.tar.gz
qemu-cb457d7679840b95de361c42921e601bd224ecf5.tar.bz2
qemu-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/r2d.c')
-rw-r--r--hw/r2d.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/r2d.c b/hw/r2d.c
index 5d5eb1e498..88853e7102 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -230,9 +230,9 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
drives_table[drive_get_index(IF_IDE, 0, 0)].bdrv, NULL);
/* NIC: rtl8139 on-board, and 2 slots. */
- pci_rtl8139_init(pci, &nd_table[0], 2 << 3);
+ pci_nic_init(pci, &nd_table[0], 2 << 3, "rtl8139");
for (i = 1; i < nb_nics; i++)
- pci_nic_init(pci, &nd_table[i], -1);
+ pci_nic_init(pci, &nd_table[i], -1, "ne2k_pci");
/* Todo: register on board registers */
{