9ae3a8
From 7565f009dfdc2a54fab24deb0a5887be00777acc Mon Sep 17 00:00:00 2001
9ae3a8
From: Juan Quintela <quintela@redhat.com>
9ae3a8
Date: Tue, 14 Jan 2014 15:07:35 +0100
9ae3a8
Subject: [PATCH 24/40] memory: s/mask/clear/ cpu_physical_memory_mask_dirty_range
9ae3a8
9ae3a8
RH-Author: Juan Quintela <quintela@redhat.com>
9ae3a8
Message-id: <1389712071-23303-25-git-send-email-quintela@redhat.com>
9ae3a8
Patchwork-id: 56679
9ae3a8
O-Subject: [RHEL7 qemu-kvm PATCH 24/40] memory: s/mask/clear/ cpu_physical_memory_mask_dirty_range
9ae3a8
Bugzilla: 997559
9ae3a8
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
9ae3a8
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
9ae3a8
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
9ae3a8
9ae3a8
Now all functions use the same wording that bitops/bitmap operations
9ae3a8
9ae3a8
Signed-off-by: Juan Quintela <quintela@redhat.com>
9ae3a8
Reviewed-by: Eric Blake <eblake@redhat.com>
9ae3a8
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9ae3a8
(cherry picked from commit ace694cccccf343852d9f0b34171ad475e248bbf)
9ae3a8
Signed-off-by: Juan Quintela <quintela@trasno.org>
9ae3a8
---
9ae3a8
 exec.c                         | 2 +-
9ae3a8
 include/exec/memory-internal.h | 6 +++---
9ae3a8
 2 files changed, 4 insertions(+), 4 deletions(-)
9ae3a8
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 exec.c                         |    2 +-
9ae3a8
 include/exec/memory-internal.h |    6 +++---
9ae3a8
 2 files changed, 4 insertions(+), 4 deletions(-)
9ae3a8
9ae3a8
diff --git a/exec.c b/exec.c
9ae3a8
index 45b2c46..77c2a0a 100644
9ae3a8
--- a/exec.c
9ae3a8
+++ b/exec.c
9ae3a8
@@ -606,7 +606,7 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
9ae3a8
     length = end - start;
9ae3a8
     if (length == 0)
9ae3a8
         return;
9ae3a8
-    cpu_physical_memory_mask_dirty_range(start, length, client);
9ae3a8
+    cpu_physical_memory_clear_dirty_range(start, length, client);
9ae3a8
 
9ae3a8
     if (tcg_enabled()) {
9ae3a8
         tlb_reset_dirty_range_all(start, end, length);
9ae3a8
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
9ae3a8
index f27b830..caff5b4 100644
9ae3a8
--- a/include/exec/memory-internal.h
9ae3a8
+++ b/include/exec/memory-internal.h
9ae3a8
@@ -109,9 +109,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
9ae3a8
     xen_modified_memory(addr, length);
9ae3a8
 }
9ae3a8
 
9ae3a8
-static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start,
9ae3a8
-                                                        ram_addr_t length,
9ae3a8
-                                                        unsigned client)
9ae3a8
+static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,
9ae3a8
+                                                         ram_addr_t length,
9ae3a8
+                                                         unsigned client)
9ae3a8
 {
9ae3a8
     ram_addr_t addr, end;
9ae3a8
 
9ae3a8
-- 
9ae3a8
1.7.1
9ae3a8