[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/7] intel_iommu: provide AddressSpaceOps.iommu_g
From: |
Liu, Yi L |
Subject: |
[Qemu-devel] [PATCH v2 5/7] intel_iommu: provide AddressSpaceOps.iommu_get instance |
Date: |
Fri, 24 Nov 2017 16:52:38 +0800 |
From: Peter Xu <address@hidden>
Provide AddressSpaceOps.iommu_get() in Intel IOMMU emulator.
Signed-off-by: Peter Xu <address@hidden>
Signed-off-by: Liu, Yi L <address@hidden>
---
hw/i386/intel_iommu.c | 8 ++++++++
include/hw/i386/intel_iommu.h | 2 ++
2 files changed, 10 insertions(+)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index e81c706..23b13b3 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -2687,6 +2687,12 @@ static const MemoryRegionOps vtd_mem_ir_ops = {
},
};
+static IOMMUObject *vtd_as_iommu_get(AddressSpace *as)
+{
+ VTDAddressSpace *vtd_dev_as = container_of(as, VTDAddressSpace, as);
+ return &vtd_dev_as->iommu_object;
+}
+
VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn)
{
uintptr_t key = (uintptr_t)bus;
@@ -2747,7 +2753,9 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s,
PCIBus *bus, int devfn)
memory_region_add_subregion_overlap(&vtd_dev_as->root,
VTD_INTERRUPT_ADDR_FIRST,
&vtd_dev_as->iommu_ir, 64);
+ iommu_object_init(&vtd_dev_as->iommu_object);
address_space_init(&vtd_dev_as->as, &vtd_dev_as->root, name);
+ vtd_dev_as->as.as_ops.iommu_get = vtd_as_iommu_get;
memory_region_add_subregion_overlap(&vtd_dev_as->root, 0,
&vtd_dev_as->sys_alias, 1);
memory_region_add_subregion_overlap(&vtd_dev_as->root, 0,
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index c85f9ff..a3c6d45 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -27,6 +27,7 @@
#include "hw/i386/ioapic.h"
#include "hw/pci/msi.h"
#include "hw/sysbus.h"
+#include "hw/core/iommu.h"
#define TYPE_INTEL_IOMMU_DEVICE "intel-iommu"
#define INTEL_IOMMU_DEVICE(obj) \
@@ -90,6 +91,7 @@ struct VTDAddressSpace {
MemoryRegion sys_alias;
MemoryRegion iommu_ir; /* Interrupt region: 0xfeeXXXXX */
IntelIOMMUState *iommu_state;
+ IOMMUObject iommu_object;
VTDContextCacheEntry context_cache_entry;
};
--
1.9.1
- [Qemu-devel] [PATCH v2 0/7] Introduce new iommu notifier framework, Liu, Yi L, 2017/11/24
- [Qemu-devel] [PATCH v2 1/7] memory: rename existing iommu notifier to be iommu mr notifier, Liu, Yi L, 2017/11/24
- [Qemu-devel] [PATCH v2 4/7] memory: introduce AddressSpaceOps, Liu, Yi L, 2017/11/24
- [Qemu-devel] [PATCH v2 3/7] hw/core: introduce IOMMUObject, Liu, Yi L, 2017/11/24
- [Qemu-devel] [PATCH v2 2/7] vfio: rename GuestIOMMU to be GuestIOMMUMR, Liu, Yi L, 2017/11/24
- [Qemu-devel] [PATCH v2 6/7] vfio/pci: add notify framework based on IOMMUObject, Liu, Yi L, 2017/11/24
- [Qemu-devel] [PATCH v2 7/7] vfio/pci: register vfio_iommu_bind_pasidtbl_notify notifier, Liu, Yi L, 2017/11/24
- [Qemu-devel] [PATCH v2 5/7] intel_iommu: provide AddressSpaceOps.iommu_get instance,
Liu, Yi L <=