[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/13] pc: Add PCMachineState::pci_host field
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 01/13] pc: Add PCMachineState::pci_host field |
Date: |
Wed, 2 Dec 2015 20:22:46 -0200 |
This will allow us to avoid direct references to piix and q35 in
acpi-build.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc_q35.c | 2 ++
hw/pci-host/piix.c | 1 +
include/hw/i386/pc.h | 1 +
3 files changed, 4 insertions(+)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 0907746..317d36a 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -171,6 +171,8 @@ static void pc_q35_init(MachineState *machine)
phb = PCI_HOST_BRIDGE(q35_host);
host_bus = phb->bus;
pcms->bus = phb->bus;
+ pcms->pci_host = phb;
+
/* create ISA bus */
lpc = pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_LPC_DEV,
ICH9_LPC_FUNC), true,
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 715208b..7711e27 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -335,6 +335,7 @@ PCIBus *i440fx_init(const char *host_type, const char
*pci_type,
address_space_io, 0, TYPE_PCI_BUS);
s->bus = b;
object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL);
+ PC_MACHINE(qdev_get_machine())->pci_host = s;
qdev_init_nofail(dev);
d = pci_create_simple(b, 0, pci_type);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 6ff4721..8b184c1 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -38,6 +38,7 @@ struct PCMachineState {
OnOffAuto vmport;
OnOffAuto smm;
ram_addr_t below_4g_mem_size, above_4g_mem_size;
+ PCIHostState *pci_host;
PCIBus *bus;
Notifier machine_done;
FWCfgState *fw_cfg;
--
2.1.0
- [Qemu-devel] [PATCH 00/13] acpi: Make piix-specific and q35-specific code generic, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 03/13] acpi: Eliminate acpi_get_i386_pci_host() function, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 02/13] acpi: Remove unnecessary check for NULL pci_host, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 01/13] pc: Add PCMachineState::pci_host field,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 04/13] acpi: Move DSDT info to PCMachineClass, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 05/13] acpi: Simplify s3/s4 property querying, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 06/13] acpi: Use &error_abort when getting PCI hotplug properties, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 07/13] acpi: Use QOM property to get CPU hotplug I/O base, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 08/13] acpi: Always try to init PCI hotplug I/O base, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 10/13] acpi: Change acpi_pci_hotplug_enabled() argument to PCMachineState, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 09/13] acpi: Use PCMachineState::acpi_dev to get ACPI dev, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 12/13] intel_iommu.h: Missing sysbus.h include, Eduardo Habkost, 2015/12/03