9ae3a8
From b48448f26497b1d92d21cc5bf5bd662f9759b65d Mon Sep 17 00:00:00 2001
9ae3a8
From: Juan Quintela <quintela@redhat.com>
9ae3a8
Date: Tue, 14 Jan 2014 15:07:33 +0100
9ae3a8
Subject: [PATCH 22/40] memory: make cpu_physical_memory_get_dirty() the main function
9ae3a8
9ae3a8
RH-Author: Juan Quintela <quintela@redhat.com>
9ae3a8
Message-id: <1389712071-23303-23-git-send-email-quintela@redhat.com>
9ae3a8
Patchwork-id: 56678
9ae3a8
O-Subject: [RHEL7 qemu-kvm PATCH 22/40] memory: make cpu_physical_memory_get_dirty() the main function
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
And make cpu_physical_memory_get_dirty_flag() to use it.  It used to
9ae3a8
be the other way around.
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 9f2c43e41a13605d3ab1e37ba433aa669652fb6b)
9ae3a8
Signed-off-by: Juan Quintela <quintela@trasno.org>
9ae3a8
---
9ae3a8
 include/exec/memory-internal.h | 36 +++++++++++++++++++-----------------
9ae3a8
 1 file changed, 19 insertions(+), 17 deletions(-)
9ae3a8
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 include/exec/memory-internal.h |   36 +++++++++++++++++++-----------------
9ae3a8
 1 files changed, 19 insertions(+), 17 deletions(-)
9ae3a8
9ae3a8
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
9ae3a8
index e8fae2a..9099561 100644
9ae3a8
--- a/include/exec/memory-internal.h
9ae3a8
+++ b/include/exec/memory-internal.h
9ae3a8
@@ -49,11 +49,28 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);
9ae3a8
 void qemu_ram_free(ram_addr_t addr);
9ae3a8
 void qemu_ram_free_from_ptr(ram_addr_t addr);
9ae3a8
 
9ae3a8
+static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
9ae3a8
+                                                ram_addr_t length,
9ae3a8
+                                                unsigned client)
9ae3a8
+{
9ae3a8
+    int ret = 0;
9ae3a8
+    ram_addr_t addr, end;
9ae3a8
+
9ae3a8
+    assert(client < DIRTY_MEMORY_NUM);
9ae3a8
+
9ae3a8
+    end = TARGET_PAGE_ALIGN(start + length);
9ae3a8
+    start &= TARGET_PAGE_MASK;
9ae3a8
+    for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
9ae3a8
+        ret |= test_bit(addr >> TARGET_PAGE_BITS,
9ae3a8
+                        ram_list.dirty_memory[client]);
9ae3a8
+    }
9ae3a8
+    return ret;
9ae3a8
+}
9ae3a8
+
9ae3a8
 static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
9ae3a8
                                                       unsigned client)
9ae3a8
 {
9ae3a8
-    assert(client < DIRTY_MEMORY_NUM);
9ae3a8
-    return test_bit(addr >> TARGET_PAGE_BITS, ram_list.dirty_memory[client]);
9ae3a8
+    return cpu_physical_memory_get_dirty(addr, 1, client);
9ae3a8
 }
9ae3a8
 
9ae3a8
 /* read dirty bit (return 0 or 1) */
9ae3a8
@@ -66,21 +83,6 @@ static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr)
9ae3a8
     return vga && code && migration;
9ae3a8
 }
9ae3a8
 
9ae3a8
-static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
9ae3a8
-                                                ram_addr_t length,
9ae3a8
-                                                unsigned client)
9ae3a8
-{
9ae3a8
-    int ret = 0;
9ae3a8
-    ram_addr_t addr, end;
9ae3a8
-
9ae3a8
-    end = TARGET_PAGE_ALIGN(start + length);
9ae3a8
-    start &= TARGET_PAGE_MASK;
9ae3a8
-    for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
9ae3a8
-        ret |= cpu_physical_memory_get_dirty_flag(addr, client);
9ae3a8
-    }
9ae3a8
-    return ret;
9ae3a8
-}
9ae3a8
-
9ae3a8
 static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,
9ae3a8
                                                       unsigned client)
9ae3a8
 {
9ae3a8
-- 
9ae3a8
1.7.1
9ae3a8