[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/10] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PC
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 01/10] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen |
Date: |
Mon, 14 Dec 2015 12:39:33 +0100 |
rename pc_xen_hvm_init_pci to pc_i440fx_init_pci,
use it for both xen and non-xen init.
That changes behavior of all pc-i440fx-$version machine types where
specifying -machine igd-passthru=on used to have no effect and now it
has. It is unlikely to cause any trouble though as there used to be
no reason to add that option to kvm guests in the first place.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Stefano Stabellini <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); \
} \
DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/10] igd passthrough chipset tweaks, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 01/10] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 02/10] pc: remove has_igd_gfx_passthru global, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 07/10] igd: revamp host config read, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 05/10] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 09/10] igd: move igd-passthrough-isa-bridge to igd.c too, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 06/10] igd: use defines for standard pci config space offsets, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 04/10] igd: switch TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE to realize, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 08/10] igd: add q35 support, Gerd Hoffmann, 2015/12/14
- [Qemu-devel] [PATCH v2 03/10] pc: move igd support code to igd.c, Gerd Hoffmann, 2015/12/14