[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/49] memory: make cpu_physical_memory_is_dirty ret
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 19/49] memory: make cpu_physical_memory_is_dirty return bool |
Date: |
Mon, 13 Jan 2014 18:40:04 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Orit Wasserman <address@hidden>
---
exec.c | 7 ++-----
include/exec/memory-internal.h | 8 ++++++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/exec.c b/exec.c
index ea78d82..a8c79e5 100644
--- a/exec.c
+++ b/exec.c
@@ -1485,11 +1485,8 @@ found:
static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
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)) {
tb_invalidate_phys_page_fast(ram_addr, size);
- dirty_flags = cpu_physical_memory_get_dirty_flags(ram_addr);
}
switch (size) {
case 1:
@@ -1504,8 +1501,8 @@ static void notdirty_mem_write(void *opaque, hwaddr
ram_addr,
default:
abort();
}
- dirty_flags |= (0xff & ~CODE_DIRTY_FLAG);
- cpu_physical_memory_set_dirty_flags(ram_addr, dirty_flags);
+ cpu_physical_memory_set_dirty_flag(ram_addr, MIGRATION_DIRTY_FLAG);
+ cpu_physical_memory_set_dirty_flag(ram_addr, VGA_DIRTY_FLAG);
/* we remove the notdirty callback only if the code has been
flushed */
if (cpu_physical_memory_is_dirty(ram_addr)) {
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
index 136198c..0b25c3f 100644
--- a/include/exec/memory-internal.h
+++ b/include/exec/memory-internal.h
@@ -56,9 +56,13 @@ static inline bool
cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
}
/* 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,
--
1.8.4.2
- [Qemu-devel] [PATCH 09/49] vmstate: Move VMState code to vmstate.c, (continued)
- [Qemu-devel] [PATCH 09/49] vmstate: Move VMState code to vmstate.c, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 13/49] bitmap: use long as index, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 14/49] memory: cpu_physical_memory_set_dirty_flags() result is never used, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 15/49] memory: cpu_physical_memory_set_dirty_range() return void, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 16/49] exec: use accessor function to know if memory is dirty, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 17/49] memory: create function to set a single dirty bit, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 18/49] exec: create function to get a single dirty bit, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 20/49] memory: all users of cpu_physical_memory_get_dirty used only one flag, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 21/49] memory: set single dirty flags when possible, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 22/49] memory: cpu_physical_memory_set_dirty_range() always dirty all flags, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 19/49] memory: make cpu_physical_memory_is_dirty return bool,
Juan Quintela <=
- [Qemu-devel] [PATCH 23/49] memory: cpu_physical_memory_mask_dirty_range() always clears a single flag, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 24/49] memory: use bit 2 for migration, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 25/49] memory: make sure that client is always inside range, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 26/49] memory: only resize dirty bitmap when memory size increases, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 27/49] memory: cpu_physical_memory_clear_dirty_flag() result is never used, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 28/49] bitmap: Add bitmap_zero_extend operation, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 30/49] memory: unfold cpu_physical_memory_clear_dirty_flag() in its only user, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 31/49] memory: unfold cpu_physical_memory_set_dirty() in its only user, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 29/49] memory: split dirty bitmap into three, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 33/49] memory: make cpu_physical_memory_get_dirty() the main function, Juan Quintela, 2014/01/13