From patchwork Tue Oct 30 08:32:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,15/35] arch_init/ram_save_setup: factor out bitmap alloc/free From: Isaku Yamahata X-Patchwork-Id: 195446 Message-Id: <789c6078d54b24257993bce45a603353f5829cc1.1351582535.git.yamahata@valinux.co.jp> To: qemu-devel@nongnu.org, kvm@vger.kernel.org Cc: benoit.hudzia@gmail.com, aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, t.hirofuchi@aist.go.jp, dlaor@redhat.com, satoshi.itoh@aist.go.jp, mdroth@linux.vnet.ibm.com, yoshikawa.takuya@oss.ntt.co.jp, owasserm@redhat.com, avi@redhat.com, pbonzini@redhat.com, chegu_vinod@hp.com Date: Tue, 30 Oct 2012 17:32:51 +0900 This will be used by postcopy. Signed-off-by: Isaku Yamahata --- Changes v2 -> v3: - new --- arch_init.c | 25 ++++++++++++++++++------- migration.h | 2 ++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/arch_init.c b/arch_init.c index ad1b01b..7e6d84e 100644 --- a/arch_init.c +++ b/arch_init.c @@ -330,6 +330,22 @@ static unsigned long *migration_bitmap; static uint64_t migration_dirty_pages; static uint32_t last_version; +void migration_bitmap_init(void) +{ + int64_t ram_pages = last_ram_offset() >> TARGET_PAGE_BITS; + if (!migration_bitmap) { + migration_bitmap = bitmap_new(ram_pages); + } + bitmap_set(migration_bitmap, 1, ram_pages); + migration_dirty_pages = ram_pages; +} + +void migration_bitmap_free(void) +{ + g_free(migration_bitmap); + migration_bitmap = NULL; +} + static inline bool migration_bitmap_test_and_reset_dirty(MemoryRegion *mr, ram_addr_t offset) { @@ -575,11 +591,7 @@ static void reset_ram_globals(void) static int ram_save_setup(QEMUFile *f, void *opaque) { RAMBlock *block; - int64_t ram_pages = last_ram_offset() >> TARGET_PAGE_BITS; - - migration_bitmap = bitmap_new(ram_pages); - bitmap_set(migration_bitmap, 1, ram_pages); - migration_dirty_pages = ram_pages; + migration_bitmap_init(); qemu_mutex_lock_ramlist(); bytes_transferred = 0; @@ -704,8 +716,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque) qemu_mutex_unlock_ramlist(); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - g_free(migration_bitmap); - migration_bitmap = NULL; + migration_bitmap_free(); return 0; } diff --git a/migration.h b/migration.h index 7d1b62d..73416ba 100644 --- a/migration.h +++ b/migration.h @@ -95,6 +95,8 @@ bool ram_save_block(QEMUFile *f, bool last_stage); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_total(void); +void migration_bitmap_init(void); +void migration_bitmap_free(void); extern SaveVMHandlers savevm_ram_handlers;