|
 |
9ae3a8 |
From 34f281f51324d0b4638803025b2a107c37ee6c4c Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 14 Jan 2014 15:07:20 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 09/40] memory: all users of cpu_physical_memory_get_dirty used only one flag
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1389712071-23303-10-git-send-email-quintela@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56665
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH 09/40] memory: all users of cpu_physical_memory_get_dirty used only one flag
|
|
|
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 |
So cpu_physical_memory_get_dirty_flags is not needed anymore
|
|
|
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 36187e2ca0295364dcb9a3f256a6fcd77e983c02)
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@trasno.org>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/exec/memory-internal.h | 9 ++-------
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/exec/memory-internal.h | 9 ++-------
|
|
|
9ae3a8 |
1 files changed, 2 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
|
|
|
9ae3a8 |
index dfc03e1..571a5ef 100644
|
|
|
9ae3a8 |
--- a/include/exec/memory-internal.h
|
|
|
9ae3a8 |
+++ b/include/exec/memory-internal.h
|
|
|
9ae3a8 |
@@ -53,11 +53,6 @@ void qemu_ram_free_from_ptr(ram_addr_t addr);
|
|
|
9ae3a8 |
#define CODE_DIRTY_FLAG 0x02
|
|
|
9ae3a8 |
#define MIGRATION_DIRTY_FLAG 0x08
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static inline int cpu_physical_memory_get_dirty_flags(ram_addr_t addr)
|
|
|
9ae3a8 |
-{
|
|
|
9ae3a8 |
- return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS];
|
|
|
9ae3a8 |
-}
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
|
|
|
9ae3a8 |
int dirty_flag)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
@@ -76,7 +71,7 @@ static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
|
|
|
9ae3a8 |
ram_addr_t length,
|
|
|
9ae3a8 |
- int dirty_flags)
|
|
|
9ae3a8 |
+ int dirty_flag)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
int ret = 0;
|
|
|
9ae3a8 |
ram_addr_t addr, end;
|
|
|
9ae3a8 |
@@ -84,7 +79,7 @@ static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
|
|
|
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_flags(addr) & dirty_flags;
|
|
|
9ae3a8 |
+ ret |= cpu_physical_memory_get_dirty_flag(addr, dirty_flag);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
return ret;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|