[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/19] i440fx: make types configurable at run-time
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 02/19] i440fx: make types configurable at run-time |
Date: |
Tue, 8 Sep 2015 18:21:03 +0100 |
From: "Michael S. Tsirkin" <address@hidden>
IGD passthrough wants to supply a different pci and
host devices, inheriting i440fx devices. Make types
configurable.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Tiejun Chen <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>
---
hw/i386/pc_piix.c | 4 +++-
hw/pci-host/piix.c | 9 ++++-----
include/hw/i386/pc.h | 6 +++++-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index b82921d..aaf7cfb 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -196,7 +196,9 @@ static void pc_init1(MachineState *machine)
}
if (pci_enabled) {
- pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
+ pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE,
+ TYPE_I440FX_PCI_DEVICE,
+ &i440fx_state, &piix3_devfn, &isa_bus, gsi,
system_memory, system_io, machine->ram_size,
pcms->below_4g_mem_size,
pcms->above_4g_mem_size,
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 1cb25f3..e19badb 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -40,7 +40,6 @@
* http://download.intel.com/design/chipsets/datashts/29054901.pdf
*/
-#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost"
#define I440FX_PCI_HOST_BRIDGE(obj) \
OBJECT_CHECK(I440FXState, (obj), TYPE_I440FX_PCI_HOST_BRIDGE)
@@ -95,7 +94,6 @@ typedef struct PIIX3State {
#define PIIX3_PCI_DEVICE(obj) \
OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3_PCI_DEVICE)
-#define TYPE_I440FX_PCI_DEVICE "i440FX"
#define I440FX_PCI_DEVICE(obj) \
OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE)
@@ -305,7 +303,8 @@ static void i440fx_realize(PCIDevice *dev, Error **errp)
dev->config[I440FX_SMRAM] = 0x02;
}
-PCIBus *i440fx_init(PCII440FXState **pi440fx_state,
+PCIBus *i440fx_init(const char *host_type, const char *pci_type,
+ PCII440FXState **pi440fx_state,
int *piix3_devfn,
ISABus **isa_bus, qemu_irq *pic,
MemoryRegion *address_space_mem,
@@ -325,7 +324,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state,
unsigned i;
I440FXState *i440fx;
- dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE);
+ dev = qdev_create(NULL, host_type);
s = PCI_HOST_BRIDGE(dev);
b = pci_bus_new(dev, NULL, pci_address_space,
address_space_io, 0, TYPE_PCI_BUS);
@@ -333,7 +332,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state,
object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL);
qdev_init_nofail(dev);
- d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE);
+ d = pci_create_simple(b, 0, pci_type);
*pi440fx_state = I440FX_PCI_DEVICE(d);
f = *pi440fx_state;
f->system_memory = address_space_mem;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index d0cad87..6edacbd 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -219,7 +219,11 @@ extern int no_hpet;
struct PCII440FXState;
typedef struct PCII440FXState PCII440FXState;
-PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn,
+#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost"
+#define TYPE_I440FX_PCI_DEVICE "i440FX"
+
+PCIBus *i440fx_init(const char *host_type, const char *pci_type,
+ PCII440FXState **pi440fx_state, int *piix_devfn,
ISABus **isa_bus, qemu_irq *pic,
MemoryRegion *address_space_mem,
MemoryRegion *address_space_io,
--
1.7.10.4
- [Qemu-devel] [PULL 0/19] xen-2015-09-08-tag, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 04/19] piix: create host bridge to passthrough, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 10/19] xen, gfx passthrough: register host bridge specific to passthrough, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 03/19] pc_init1: pass parameters just with types, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 08/19] igd gfx passthrough: create a isa bridge, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 05/19] hw/pci-assign: split pci-assign.c, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 09/19] xen, gfx passthrough: register a isa bridge, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 01/19] xen-hvm: Add trace to ioreq, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 07/19] xen, gfx passthrough: retrieve VGA BIOS to work, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 02/19] i440fx: make types configurable at run-time,
Stefano Stabellini <=
- [Qemu-devel] [PULL 06/19] xen, gfx passthrough: basic graphics passthrough support, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 17/19] xen: use errno instead of rc for xc_domain_add_to_physmap, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 15/19] xen/pt: Make xen_pt_msi_set_enable static, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 19/19] xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings., Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 11/19] xen, gfx passthrough: add opregion mapping, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 14/19] xen/pt: Update comments with proper function name., Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 12/19] xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 13/19] xen/HVM: atomically access pointers in bufioreq handling, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 18/19] xen/pt/msi: Add the register value when printing logging and error messages, Stefano Stabellini, 2015/09/08
- [Qemu-devel] [PULL 16/19] xen/pt: xen_host_pci_config_read returns -errno, not -1 on failure, Stefano Stabellini, 2015/09/08