From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6Md6-0006h9-1I for qemu-devel@nongnu.org; Tue, 08 Dec 2015 13:04:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6Mcw-0001jm-WA for qemu-devel@nongnu.org; Tue, 08 Dec 2015 13:04:47 -0500 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:38827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6Mcw-0001jE-RF for qemu-devel@nongnu.org; Tue, 08 Dec 2015 13:04:38 -0500 Received: by wmec201 with SMTP id c201so40373200wme.1 for ; Tue, 08 Dec 2015 10:04:38 -0800 (PST) References: <1449583648-12017-1-git-send-email-kraxel@redhat.com> <1449583648-12017-2-git-send-email-kraxel@redhat.com> From: Marcel Apfelbaum Message-ID: <56671BB3.30600@gmail.com> Date: Tue, 8 Dec 2015 20:04:35 +0200 MIME-Version: 1.0 In-Reply-To: <1449583648-12017-2-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/7] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , qemu-devel@nongnu.org Cc: igvt-g@ml01.01.org, Richard Henderson , Paolo Bonzini , Eduardo Habkost , "Michael S. Tsirkin" On 12/08/2015 04:07 PM, Gerd Hoffmann wrote: > 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); \ Hi Gerd, A quick question, does IGD_PASSTHROUGH makes sense for compat machine types? On the same topic, does machine->igd_gfx_passthru makes sense for all machine types? Thanks, Marcel > } \ > DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn) > >