haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

memory: make cpu_physical_memory_is_dirty return bool

Browse source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
Juan Quintela 2013-10-08 12:01:01 +02:00
parent 7e5609a85e
commit 4f08cabe9e
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
exec.c
View file

@ -1485,11 +1485,8 @@ found:
static void notdirty_mem_write(void *opaque, hwaddr ram_addr, static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
uint64_t val, unsigned size) uint64_t val, unsigned size)
{ {
int dirty_flags;
dirty_flags = cpu_physical_memory_get_dirty_flags(ram_addr);
if (!cpu_physical_memory_get_dirty_flag(ram_addr, CODE_DIRTY_FLAG)) { if (!cpu_physical_memory_get_dirty_flag(ram_addr, CODE_DIRTY_FLAG)) {
tb_invalidate_phys_page_fast(ram_addr, size); tb_invalidate_phys_page_fast(ram_addr, size);
dirty_flags = cpu_physical_memory_get_dirty_flags(ram_addr);
} }
switch (size) { switch (size) {
case 1: case 1:
@ -1504,8 +1501,8 @@ static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
default: default:
abort(); abort();
} }
dirty_flags |= (0xff & ~CODE_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(ram_addr, MIGRATION_DIRTY_FLAG);
cpu_physical_memory_set_dirty_flags(ram_addr, dirty_flags); cpu_physical_memory_set_dirty_flag(ram_addr, VGA_DIRTY_FLAG);
/* we remove the notdirty callback only if the code has been /* we remove the notdirty callback only if the code has been
flushed */ flushed */
if (cpu_physical_memory_is_dirty(ram_addr)) { if (cpu_physical_memory_is_dirty(ram_addr)) {

8
include/exec/memory-internal.h
View file

@ -56,9 +56,13 @@ static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
} }
/* read dirty bit (return 0 or 1) */ /* read dirty bit (return 0 or 1) */
static inline int cpu_physical_memory_is_dirty(ram_addr_t addr) static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr)
{ {
return cpu_physical_memory_get_dirty_flags(addr) == 0xff; bool vga = cpu_physical_memory_get_dirty_flag(addr, VGA_DIRTY_FLAG);
bool code = cpu_physical_memory_get_dirty_flag(addr, CODE_DIRTY_FLAG);
bool migration =
cpu_physical_memory_get_dirty_flag(addr, MIGRATION_DIRTY_FLAG);
return vga && code && migration;
} }
static inline int cpu_physical_memory_get_dirty(ram_addr_t start, static inline int cpu_physical_memory_get_dirty(ram_addr_t start,