[PULL v2 10/32] memory: Set DIRTY_MEMORY_MIGRATION when IOMMU is enabled

From: Alex Williamson <alex.williamson@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Kirti Wankhede <kwankhede@nvidia.com>,
	Yan Zhao <yan.y.zhao@intel.com>
Subject: [PULL v2 10/32] memory: Set DIRTY_MEMORY_MIGRATION when IOMMU is enabled
Date: Wed, 28 Oct 2020 10:40:55 -0600	[thread overview]
Message-ID: <160390325499.12234.15952466871554359833.stgit@gimli.home> (raw)
In-Reply-To: <160390309510.12234.8858324597971641979.stgit@gimli.home>

From: Kirti Wankhede <kwankhede@nvidia.com>

mr->ram_block is NULL when mr->is_iommu is true, then fr.dirty_log_mask
wasn't set correctly due to which memory listener's log_sync doesn't
get called.
This patch returns log_mask with DIRTY_MEMORY_MIGRATION set when
IOMMU is enabled.

Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
Reviewed-by: Yan Zhao <yan.y.zhao@intel.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 softmmu/memory.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/softmmu/memory.c b/softmmu/memory.c
index ee4a6bc16859..21d533d8ed84 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -1806,7 +1806,7 @@ bool memory_region_is_ram_device(MemoryRegion *mr)
 uint8_t memory_region_get_dirty_log_mask(MemoryRegion *mr)
 {
     uint8_t mask = mr->dirty_log_mask;
-    if (global_dirty_log && mr->ram_block) {
+    if (global_dirty_log && (mr->ram_block || memory_region_is_iommu(mr))) {
         mask |= (1 << DIRTY_MEMORY_MIGRATION);
     }
     return mask;


