Message ID | 1436247191-13577-10-git-send-email-tiejun.chen@intel.com |
---|---|
State | New |
Headers | show |
On Tue, 7 Jul 2015, Tiejun Chen wrote: > Just register that pci host bridge specific to passthrough. > > Signed-off-by: Tiejun Chen <tiejun.chen@intel.com> > Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> This is good, the Acked-by is appropriate. Cheers, Stefano > v9: > > * Simplify pc_xen_hvm_init_pci() > > hw/i386/pc_piix.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b4daefa..67358f6 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -50,7 +50,8 @@ > #include "cpu.h" > #include "qemu/error-report.h" > #ifdef CONFIG_XEN > -# include <xen/hvm/hvm_info_table.h> > +#include <xen/hvm/hvm_info_table.h> > +#include "hw/xen/xen_pt.h" > #endif > #include "migration/migration.h" > > @@ -442,11 +443,21 @@ static void pc_init_isa(MachineState *machine) > } > > #ifdef CONFIG_XEN > +static void pc_xen_hvm_init_pci(MachineState *machine) > +{ > + const char *pci_type = has_igd_gfx_passthru ? > + TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE; > + > + pc_init1(machine, > + TYPE_I440FX_PCI_HOST_BRIDGE, > + pci_type); > +} > + > static void pc_xen_hvm_init(MachineState *machine) > { > PCIBus *bus; > > - pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); > + pc_xen_hvm_init_pci(machine); > > bus = pci_find_primary_bus(); > if (bus != NULL) { > -- > 1.9.1 >
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index b4daefa..67358f6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -50,7 +50,8 @@ #include "cpu.h" #include "qemu/error-report.h" #ifdef CONFIG_XEN -# include <xen/hvm/hvm_info_table.h> +#include <xen/hvm/hvm_info_table.h> +#include "hw/xen/xen_pt.h" #endif #include "migration/migration.h" @@ -442,11 +443,21 @@ static void pc_init_isa(MachineState *machine) } #ifdef CONFIG_XEN +static void pc_xen_hvm_init_pci(MachineState *machine) +{ + const char *pci_type = has_igd_gfx_passthru ? + TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE; + + pc_init1(machine, + TYPE_I440FX_PCI_HOST_BRIDGE, + pci_type); +} + static void pc_xen_hvm_init(MachineState *machine) { PCIBus *bus; - pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); + pc_xen_hvm_init_pci(machine); bus = pci_find_primary_bus(); if (bus != NULL) {