62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
From 4c9e81175e15ca78c7ba7090ec20ea10c9e12751 Mon Sep 17 00:00:00 2001
|
|
From: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
Date: Fri, 18 Nov 2022 15:22:53 +0800
|
|
Subject: [PATCH 31/36] Revert "memory: Add IOMMU_ATTR_VFIO_NESTED IOMMU memory
|
|
region attribute"
|
|
|
|
This reverts commit b380e3e0c30fb68dbbfb1397f3c374adfff77ac4.
|
|
|
|
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
---
|
|
hw/arm/smmuv3.c | 12 ------------
|
|
include/exec/memory.h | 3 +--
|
|
2 files changed, 1 insertion(+), 14 deletions(-)
|
|
|
|
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
|
|
index 5a092506d3..f4de66827d 100644
|
|
--- a/hw/arm/smmuv3.c
|
|
+++ b/hw/arm/smmuv3.c
|
|
@@ -1593,17 +1593,6 @@ static int smmuv3_notify_flag_changed(IOMMUMemoryRegion *iommu,
|
|
return 0;
|
|
}
|
|
|
|
-static int smmuv3_get_attr(IOMMUMemoryRegion *iommu,
|
|
- enum IOMMUMemoryRegionAttr attr,
|
|
- void *data)
|
|
-{
|
|
- if (attr == IOMMU_ATTR_VFIO_NESTED) {
|
|
- *(bool *) data = true;
|
|
- return 0;
|
|
- }
|
|
- return -EINVAL;
|
|
-}
|
|
-
|
|
static void smmuv3_iommu_memory_region_class_init(ObjectClass *klass,
|
|
void *data)
|
|
{
|
|
@@ -1611,7 +1600,6 @@ static void smmuv3_iommu_memory_region_class_init(ObjectClass *klass,
|
|
|
|
imrc->translate = smmuv3_translate;
|
|
imrc->notify_flag_changed = smmuv3_notify_flag_changed;
|
|
- imrc->get_attr = smmuv3_get_attr;
|
|
}
|
|
|
|
static const TypeInfo smmuv3_type_info = {
|
|
diff --git a/include/exec/memory.h b/include/exec/memory.h
|
|
index 229c9cf85b..273f7f45d3 100644
|
|
--- a/include/exec/memory.h
|
|
+++ b/include/exec/memory.h
|
|
@@ -324,8 +324,7 @@ typedef struct MemoryRegionClass {
|
|
|
|
|
|
enum IOMMUMemoryRegionAttr {
|
|
- IOMMU_ATTR_SPAPR_TCE_FD,
|
|
- IOMMU_ATTR_VFIO_NESTED,
|
|
+ IOMMU_ATTR_SPAPR_TCE_FD
|
|
};
|
|
|
|
/*
|
|
--
|
|
2.27.0
|
|
|