On 06/20/2013 06:11 AM, Michael S. Tsirkin wrote: > From: David Gibson <da...@gibson.dropbear.id.au> > > 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 <da...@gibson.dropbear.id.au> > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > --- > hw/alpha/dp264.c | 2 +- > hw/arm/realview.c | 6 ++++-- > hw/arm/versatilepb.c | 2 +- > hw/i386/pc.c | 2 +- > hw/mips/mips_fulong2e.c | 6 +++--- > hw/mips/mips_malta.c | 6 +++--- > hw/pci/pci-hotplug-old.c | 3 ++- > hw/pci/pci.c | 10 ++++++---- > hw/ppc/e500.c | 2 +- > hw/ppc/mac_newworld.c | 2 +- > hw/ppc/mac_oldworld.c | 2 +- > hw/ppc/ppc440_bamboo.c | 2 +- > hw/ppc/prep.c | 2 +- > hw/ppc/spapr.c | 2 +- > hw/sh4/r2d.c | 5 ++++- > hw/sparc64/sun4u.c | 2 +- > include/hw/pci/pci.h | 6 ++++-- > 17 files changed, 36 insertions(+), 26 deletions(-)
Acked-by: Richard Henderson <r...@twiddle.net> r~
