From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6Ivu-0006DZ-H1 for qemu-devel@nongnu.org; Tue, 08 Dec 2015 09:07:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6Ivo-0006Zc-L7 for qemu-devel@nongnu.org; Tue, 08 Dec 2015 09:07:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6Ivo-0006Z9-Gh for qemu-devel@nongnu.org; Tue, 08 Dec 2015 09:07:52 -0500 From: Gerd Hoffmann Date: Tue, 8 Dec 2015 15:07:22 +0100 Message-Id: <1449583648-12017-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1449583648-12017-1-git-send-email-kraxel@redhat.com> References: <1449583648-12017-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/7] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: igvt-g@ml01.01.org, Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , Richard Henderson rename pc_xen_hvm_init_pci to pc_i440fx_init_pci, use it for both xen and non-xen init. Signed-off-by: Gerd Hoffmann --- hw/i386/pc_piix.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2e41efe..ce6c3c5 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -419,10 +419,9 @@ static void pc_init_isa(MachineState *machine) pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); } -#ifdef CONFIG_XEN -static void pc_xen_hvm_init_pci(MachineState *machine) +static void pc_i440fx_init_pci(MachineState *machine) { - const char *pci_type = has_igd_gfx_passthru ? + const char *pci_type = machine->igd_gfx_passthru ? TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE; pc_init1(machine, @@ -430,6 +429,7 @@ static void pc_xen_hvm_init_pci(MachineState *machine) pci_type); } +#ifdef CONFIG_XEN static void pc_xen_hvm_init(MachineState *machine) { PCIBus *bus; @@ -439,7 +439,7 @@ static void pc_xen_hvm_init(MachineState *machine) exit(1); } - pc_xen_hvm_init_pci(machine); + pc_i440fx_init_pci(machine); bus = pci_find_primary_bus(); if (bus != NULL) { @@ -455,8 +455,7 @@ static void pc_xen_hvm_init(MachineState *machine) if (compat) { \ compat(machine); \ } \ - pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \ - TYPE_I440FX_PCI_DEVICE); \ + pc_i440fx_init_pci(machine); \ } \ DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn) -- 1.8.3.1