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