summaryrefslogtreecommitdiff
path: root/hw/alpha
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2013-06-06 18:48:51 +1000
committerMichael S. Tsirkin <mst@redhat.com>2013-07-07 23:10:57 +0300
commit29b358f93a48a415853d11fc9b02f711b5ec8f76 (patch)
treeb09d6014da1942fe62614830996552dec90fd18d /hw/alpha
parent85c6e4fabb4c26e5cd8a024415ed2f5bcdd578db (diff)
downloadqemu-29b358f93a48a415853d11fc9b02f711b5ec8f76.tar.gz
pci: Add root bus parameter to pci_nic_init()
At present, pci_nic_init() and pci_nic_init_nofail() assume that they will only create a NIC under the primary PCI root. As we add support for multiple PCI roots, that may no longer be the case. This patch adds a root bus parameter to pci_nic_init() (and updates callers accordingly) to allow the machine init code using it to specify the right PCI root for NICs created by old-style -net nic parameters. NICs created new-style, with -device can of course be put anywhere. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/alpha')
-rw-r--r--hw/alpha/dp264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 8695efb8ef..8dad08fac2 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -89,7 +89,7 @@ static void clipper_init(QEMUMachineInitArgs *args)
/* Network setup. e1000 is good enough, failing Tulip support. */
for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], "e1000", NULL);
+ pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL);
}
/* IDE disk setup. */