[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 03/28] x86-iommu: provide x86_iommu_get_default
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v11 03/28] x86-iommu: provide x86_iommu_get_default |
Date: |
Tue, 5 Jul 2016 16:19:04 +0800 |
Instead of searching the device tree every time, one static variable is
declared for the default system x86 IOMMU device.
Signed-off-by: Peter Xu <address@hidden>
---
hw/i386/acpi-build.c | 9 ++-------
hw/i386/x86-iommu.c | 23 +++++++++++++++++++++++
include/hw/i386/x86-iommu.h | 6 ++++++
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b1adf04..1186401 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -52,7 +52,7 @@
#include "hw/i386/ich9.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci-host/q35.h"
-#include "hw/i386/intel_iommu.h"
+#include "hw/i386/x86-iommu.h"
#include "hw/timer/hpet.h"
#include "hw/acpi/aml-build.h"
@@ -2598,12 +2598,7 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
static bool acpi_has_iommu(void)
{
- bool ambiguous;
- Object *intel_iommu;
-
- intel_iommu = object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE,
- &ambiguous);
- return intel_iommu && !ambiguous;
+ return !!x86_iommu_get_default();
}
static
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index d739afb..f395139 100644
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -21,6 +21,28 @@
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/i386/x86-iommu.h"
+#include "qemu/error-report.h"
+
+/* Default X86 IOMMU device */
+static X86IOMMUState *x86_iommu_default = NULL;
+
+static void x86_iommu_set_default(X86IOMMUState *x86_iommu)
+{
+ assert(x86_iommu);
+
+ if (x86_iommu_default) {
+ error_report("QEMU does not support multiple vIOMMUs "
+ "for x86 yet.");
+ exit(1);
+ }
+
+ x86_iommu_default = x86_iommu;
+}
+
+X86IOMMUState *x86_iommu_get_default(void)
+{
+ return x86_iommu_default;
+}
static void x86_iommu_realize(DeviceState *dev, Error **errp)
{
@@ -28,6 +50,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
if (x86_class->realize) {
x86_class->realize(dev, errp);
}
+ x86_iommu_set_default(X86_IOMMU_DEVICE(dev));
}
static void x86_iommu_class_init(ObjectClass *klass, void *data)
diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h
index fac693d..b2401a6 100644
--- a/include/hw/i386/x86-iommu.h
+++ b/include/hw/i386/x86-iommu.h
@@ -45,4 +45,10 @@ struct X86IOMMUState {
SysBusDevice busdev;
};
+/**
+ * x86_iommu_get_default - get default IOMMU device
+ * @return: pointer to default IOMMU device
+ */
+X86IOMMUState *x86_iommu_get_default(void);
+
#endif
--
2.4.11
- [Qemu-devel] [PATCH v11 00/28] IOMMU: Enable interrupt remapping for Intel IOMMU, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 01/28] x86-iommu: introduce parent class, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 02/28] intel_iommu: rename VTD_PCI_DEVFN_MAX to x86-iommu, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 03/28] x86-iommu: provide x86_iommu_get_default,
Peter Xu <=
- [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), Peter Xu, 2016/07/05
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), Jan Kiszka, 2016/07/09
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), Peter Xu, 2016/07/11
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), David Kiarie, 2016/07/11
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), Peter Xu, 2016/07/11
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), David Kiarie, 2016/07/11
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), Peter Xu, 2016/07/11
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), Paolo Bonzini, 2016/07/11
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), Peter Xu, 2016/07/11
- Re: [Qemu-devel] [PATCH v11 04/28] x86-iommu: q35: generalize find_add_as(), David Kiarie, 2016/07/11