@@ -2491,19 +2491,6 @@ build_mcfg_q35(GArray *table_data, GArray *linker, AcpiMcfgInfo *info)
build_header(linker, table_data, (void *)mcfg, sig, len, 1, NULL, NULL);
}
-static IntelIOMMUState *acpi_get_iommu(void)
-{
- bool ambiguous = false;
- Object *intel_iommu = NULL;
-
- intel_iommu = object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE,
- &ambiguous);
- if (ambiguous)
- intel_iommu = NULL;
-
- return (IntelIOMMUState *)intel_iommu;
-}
-
static void
build_dmar_q35(GArray *table_data, GArray *linker)
{
@@ -2512,7 +2499,7 @@ build_dmar_q35(GArray *table_data, GArray *linker)
AcpiTableDmar *dmar;
AcpiDmarHardwareUnit *drhd;
uint8_t dmar_flags = 0;
- IntelIOMMUState *intel_iommu = acpi_get_iommu();
+ IntelIOMMUState *intel_iommu = vtd_iommu_get();
AcpiDmarDeviceScope *scope = NULL;
/* Root complex IOAPIC use one path[0] only */
uint16_t scope_size = sizeof(*scope) + sizeof(uint16_t);
@@ -2613,7 +2600,7 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
static bool acpi_has_iommu(void)
{
- return !!acpi_get_iommu();
+ return !!vtd_iommu_get();
}
static bool acpi_has_nvdimm(void)
@@ -2000,6 +2000,19 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn)
return vtd_dev_as;
}
+IntelIOMMUState *vtd_iommu_get(void)
+{
+ bool ambiguous = false;
+ Object *intel_iommu = NULL;
+
+ intel_iommu = object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE,
+ &ambiguous);
+ if (ambiguous)
+ intel_iommu = NULL;
+
+ return (IntelIOMMUState *)intel_iommu;
+}
+
/* Do the initialization. It will also be called when reset, so pay
* attention when adding new initialization stuff.
*/
@@ -197,5 +197,7 @@ struct IntelIOMMUState {
* create a new one if none exists
*/
VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn);
+/* Get default IOMMU object */
+IntelIOMMUState *vtd_iommu_get(void);
#endif
Moves acpi_get_iommu() under VT-d to make it a public function. Signed-off-by: Peter Xu <peterx@redhat.com> --- hw/i386/acpi-build.c | 17 ++--------------- hw/i386/intel_iommu.c | 13 +++++++++++++ include/hw/i386/intel_iommu.h | 2 ++ 3 files changed, 17 insertions(+), 15 deletions(-)