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