openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

memory: make cpu_physical_memory_get_dirty() the main function 

And make cpu_physical_memory_get_dirty_flag() to use it.  It used to
be the other way around.

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 20:35:39 +02:00
parent c1427a3f84
commit 9f2c43e41a
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/exec/memory-internal.h
View File

@ -40,11 +40,28 @@ void *qemu_get_ram_ptr(ram_addr_t addr);
void qemu_ram_free(ram_addr_t addr); void qemu_ram_free(ram_addr_t addr);
void qemu_ram_free_from_ptr(ram_addr_t addr); void qemu_ram_free_from_ptr(ram_addr_t addr);
static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
ram_addr_t length,
unsigned client)
{
int ret = 0;
ram_addr_t addr, end;
assert(client < DIRTY_MEMORY_NUM);
end = TARGET_PAGE_ALIGN(start + length);
start &= TARGET_PAGE_MASK;
for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
ret |= test_bit(addr >> TARGET_PAGE_BITS,
ram_list.dirty_memory[client]);
}
return ret;
}
static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
unsigned client) unsigned client)
{ {
assert(client < DIRTY_MEMORY_NUM); return cpu_physical_memory_get_dirty(addr, 1, client);
return test_bit(addr >> TARGET_PAGE_BITS, ram_list.dirty_memory[client]);
} }
/* read dirty bit (return 0 or 1) */ /* read dirty bit (return 0 or 1) */
@ -57,21 +74,6 @@ static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr)
return vga && code && migration; return vga && code && migration;
} }
static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
ram_addr_t length,
unsigned client)
{
int ret = 0;
ram_addr_t addr, end;
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_flag(addr, client);
}
return ret;
}
static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,
unsigned client) unsigned client)
{ {