[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 23/23] hw: i386: Refactor PCI host getter
From: |
Samuel Ortiz |
Subject: |
[Qemu-devel] [PATCH v4 23/23] hw: i386: Refactor PCI host getter |
Date: |
Thu, 1 Nov 2018 11:23:03 +0100 |
From: Yang Zhong <address@hidden>
Now that the ACPI builder methods are added, we can reach the ACPI
configuration pointer from the MachineState pointer. From there we can
get to the PCI host pointer and return it.
This makes the PCI host getter an ACPI, architecture agnostic function.
Signed-off-by: Yang Zhong <address@hidden>
---
hw/acpi/aml-build.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 33db1c1bc8..e8b087fcf5 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -22,6 +22,8 @@
#include "qemu/osdep.h"
#include <glib/gprintf.h>
#include "hw/acpi/aml-build.h"
+#include "hw/acpi/builder.h"
+#include "hw/mem/memory-device.h"
#include "qemu/bswap.h"
#include "qemu/bitops.h"
#include "sysemu/numa.h"
@@ -1617,23 +1619,15 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables,
bool mfre)
g_array_free(tables->vmgenid, mfre);
}
-/*
- * Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE.
- */
Object *acpi_get_pci_host(void)
{
- PCIHostState *host;
+ MachineState *ms = MACHINE(qdev_get_machine());
+ AcpiBuilder *ab = ACPI_BUILDER(ms);
+ AcpiConfiguration *acpi_conf;
- host = OBJECT_CHECK(PCIHostState,
- object_resolve_path("/machine/i440fx", NULL),
- TYPE_PCI_HOST_BRIDGE);
- if (!host) {
- host = OBJECT_CHECK(PCIHostState,
- object_resolve_path("/machine/q35", NULL),
- TYPE_PCI_HOST_BRIDGE);
- }
+ acpi_conf = acpi_builder_configuration(ab);
- return OBJECT(host);
+ return OBJECT(acpi_conf->pci_host);
}
--
2.19.1
- [Qemu-devel] [PATCH v4 16/23] hw: acpi: Export the PCI hotplug API, (continued)
- [Qemu-devel] [PATCH v4 16/23] hw: acpi: Export the PCI hotplug API, Samuel Ortiz, 2018/11/01
- [Qemu-devel] [PATCH v4 17/23] hw: i386: Export the MADT build method, Samuel Ortiz, 2018/11/01
- [Qemu-devel] [PATCH v4 21/23] hw: pci-host: piix: Return PCI host pointer instead of PCI bus, Samuel Ortiz, 2018/11/01
- [Qemu-devel] [PATCH v4 18/23] hw: acpi: Retrieve the PCI bus from AcpiPciHpState, Samuel Ortiz, 2018/11/01
- [Qemu-devel] [PATCH v4 20/23] hw: i386: Implement the ACPI builder interface for PC, Samuel Ortiz, 2018/11/01
- [Qemu-devel] [PATCH v4 22/23] hw: i386: Set ACPI configuration PCI host pointer, Samuel Ortiz, 2018/11/01
- [Qemu-devel] [PATCH v4 19/23] hw: acpi: Define ACPI tables builder interface, Samuel Ortiz, 2018/11/01
- [Qemu-devel] [PATCH v4 23/23] hw: i386: Refactor PCI host getter,
Samuel Ortiz <=
- Re: [Qemu-devel] [PATCH v4 00/23] ACPI reorganization for hardware-reduced support, Igor Mammedov, 2018/11/02