diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2013-06-06 18:48:51 +1000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-07-07 23:10:57 +0300 |
| commit | 29b358f93a48a415853d11fc9b02f711b5ec8f76 (patch) | |
| tree | b09d6014da1942fe62614830996552dec90fd18d /hw/arm/versatilepb.c | |
| parent | 85c6e4fabb4c26e5cd8a024415ed2f5bcdd578db (diff) | |
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/arm/versatilepb.c')
| -rw-r--r-- | hw/arm/versatilepb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 753757ea19..15eb086831 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -244,7 +244,7 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) smc91c111_init(nd, 0x10010000, sic[25]); done_smc = 1; } else { - pci_nic_init_nofail(nd, "rtl8139", NULL); + pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL); } } if (usb_enabled(false)) { |