From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4UcQ-0004Jv-Hj for qemu-devel@nongnu.org; Thu, 03 Dec 2015 09:12:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4UcO-0007Cy-O0 for qemu-devel@nongnu.org; Thu, 03 Dec 2015 09:12:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4UcO-0007Ce-IF for qemu-devel@nongnu.org; Thu, 03 Dec 2015 09:12:20 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 2ADCCC4096 for ; Thu, 3 Dec 2015 14:12:20 +0000 (UTC) From: Eduardo Habkost Date: Wed, 2 Dec 2015 20:22:46 -0200 Message-Id: <1449094978-22986-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1449094978-22986-1-git-send-email-ehabkost@redhat.com> References: <1449094978-22986-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 01/13] pc: Add PCMachineState::pci_host field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" This will allow us to avoid direct references to piix and q35 in acpi-build.c. Signed-off-by: Eduardo Habkost --- 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