Re: [Qemu-devel] [PATCH 1/7] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen

[Marcel Apfelbaum]

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 <address@hidden>
> ---
>   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)