From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpiKb-0003nM-LH for qemu-devel@nongnu.org; Thu, 20 Jun 2013 13:07:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpiKX-0006Ar-Hd for qemu-devel@nongnu.org; Thu, 20 Jun 2013 13:07:33 -0400 Sender: Richard Henderson Message-ID: <51C336CB.5080202@twiddle.net> Date: Thu, 20 Jun 2013 10:07:23 -0700 From: Richard Henderson MIME-Version: 1.0 References: <1371730033-5554-1-git-send-email-mst@redhat.com> <1371730033-5554-19-git-send-email-mst@redhat.com> In-Reply-To: <1371730033-5554-19-git-send-email-mst@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 18/21] pci: Add root bus parameter to pci_nic_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Peter Maydell , Anthony Liguori , Stefan Weil , qemu-devel@nongnu.org, Alexander Graf , Blue Swirl , Avik Sil , =?ISO-8859-1?Q?Andreas_F=E4rber?= , qemu-ppc@nongnu.org, Paul Brook , Scott Wood , Paolo Bonzini , Aurelien Jarno , David Gibson On 06/20/2013 06:11 AM, Michael S. Tsirkin wrote: > From: David Gibson > > 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 > Signed-off-by: Michael S. Tsirkin > --- > 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~