From 609b216873bfa9377f624dabcf709930e1722ca7 Mon Sep 17 00:00:00 2001
From: Kunkun Jiang <jiangkunkun@huawei.com>
Date: Fri, 18 Nov 2022 15:22:20 +0800
Subject: [PATCH 05/36] Revert "vfio: Add vfio_prereg_listener_log_clear to
 re-enable mark dirty pages"

This reverts commit 7086df6d90cd698a3e20cf4cf6e9a834f168cd8f.

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

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 20c820aa74..2506cd57ee 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1857,43 +1857,6 @@ static int vfio_physical_log_clear(VFIOContainer *container,
     return ret;
 }
 
-static void vfio_prereg_listener_log_clear(MemoryListener *listener,
-                                           MemoryRegionSection *section)
-{
-    VFIOContainer *container =
-        container_of(listener, VFIOContainer, prereg_listener);
-
-    if (!memory_region_is_ram(section->mr)) {
-        return;
-    }
-
-    vfio_physical_log_clear(container, section);
-}
-
-static int vfio_clear_dirty_bitmap(VFIOContainer *container,
-                                   MemoryRegionSection *section)
-{
-    if (memory_region_is_iommu(section->mr)) {
-        /*
-         * In nested mode, stage 2 (gpa->hpa) and stage 1 (giova->gpa) are
-         * set up separately. It is inappropriate to pass 'giova' to kernel
-         * to get dirty pages. We only need to focus on stage 2 mapping when
-         * marking dirty pages.
-         */
-        if (container->iommu_type == VFIO_TYPE1_NESTING_IOMMU) {
-            return 0;
-        }
-
-        /*
-         * TODO: x86. With the log_clear() interface added, x86 may inplement
-         * its own method.
-         */
-    }
-
-    /* Here we assume that memory_region_is_ram(section->mr) == true */
-    return vfio_physical_log_clear(container, section);
-}
-
 static void vfio_listener_log_clear(MemoryListener *listener,
                                     MemoryRegionSection *section)
 {
@@ -1905,7 +1868,7 @@ static void vfio_listener_log_clear(MemoryListener *listener,
     }
 
     if (vfio_devices_all_dirty_tracking(container)) {
-        vfio_clear_dirty_bitmap(container, section);
+        vfio_physical_log_clear(container, section);
     }
 }
 
@@ -1923,7 +1886,6 @@ static MemoryListener vfio_memory_prereg_listener = {
     .region_add = vfio_prereg_listener_region_add,
     .region_del = vfio_prereg_listener_region_del,
     .log_sync = vfio_prereg_listener_log_sync,
-    .log_clear = vfio_prereg_listener_log_clear,
 };
 
 static void vfio_listener_release(VFIOContainer *container)
-- 
2.27.0