diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-07-20 10:36:12 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-10-17 18:34:58 +0200 |
| commit | 69268cde142d169e2e47836bcf0a26341e30218a (patch) | |
| tree | c8d3fa68e8e8c931ed11f10d1e16fee59bfb8510 /arch_init.c | |
| parent | e44d26c8f3894a220f29ff5b27abf87f570d2c07 (diff) | |
| download | qemu-69268cde142d169e2e47836bcf0a26341e30218a.tar.gz qemu-69268cde142d169e2e47836bcf0a26341e30218a.tar.bz2 qemu-69268cde142d169e2e47836bcf0a26341e30218a.zip | |
ram: Introduce migration_bitmap_test_and_reset_dirty()
It just test if the dirty bit is set, and clears it.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/arch_init.c b/arch_init.c index fa470515db..90a722e6c9 100644 --- a/arch_init.c +++ b/arch_init.c @@ -331,6 +331,19 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, static RAMBlock *last_block; static ram_addr_t last_offset; +static inline bool migration_bitmap_test_and_reset_dirty(MemoryRegion *mr, + ram_addr_t offset) +{ + bool ret = memory_region_get_dirty(mr, offset, TARGET_PAGE_SIZE, + DIRTY_MEMORY_MIGRATION); + + if (ret) { + memory_region_reset_dirty(mr, offset, TARGET_PAGE_SIZE, + DIRTY_MEMORY_MIGRATION); + } + return ret; +} + static inline void migration_bitmap_set_dirty(MemoryRegion *mr, int length) { ram_addr_t addr; @@ -364,14 +377,10 @@ static int ram_save_block(QEMUFile *f, bool last_stage) do { mr = block->mr; - if (memory_region_get_dirty(mr, offset, TARGET_PAGE_SIZE, - DIRTY_MEMORY_MIGRATION)) { + if (migration_bitmap_test_and_reset_dirty(mr, offset)) { uint8_t *p; int cont = (block == last_block) ? RAM_SAVE_FLAG_CONTINUE : 0; - memory_region_reset_dirty(mr, offset, TARGET_PAGE_SIZE, - DIRTY_MEMORY_MIGRATION); - p = memory_region_get_ram_ptr(mr) + offset; if (is_dup_page(p)) { |