From 2dc27b19fd8a17b23b112e84b9d7286d8c5f30ca Mon Sep 17 00:00:00 2001
From: Kunkun Jiang <jiangkunkun@huawei.com>
Date: Fri, 18 Nov 2022 15:22:25 +0800
Subject: [PATCH 08/36] Revert "vfio/common: Avoid unmap ram section at
 vfio_listener_region_del() in nested mode"

This reverts commit 9d7b782a0b2c5288e82f3064b4c5b7bf18887280.

Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
---
 hw/vfio/common.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index bdfcc854fe..d05a485808 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1441,16 +1441,6 @@ static void vfio_listener_region_del(MemoryListener *listener,
             }
         }
 
-        /*
-         * In nested mode, stage 2 (gpa->hpa) and the stage 1
-         * (giova->gpa) are set separately. The ram section
-         * will be unmapped in vfio_prereg_listener_region_del().
-         * Hence it doesn't need to unmap ram section here.
-         */
-        if (container->iommu_type == VFIO_TYPE1_NESTING_IOMMU) {
-            return;
-        }
-
         /*
          * FIXME: We assume the one big unmap below is adequate to
          * remove any individual page mappings in the IOMMU which
-- 
2.27.0