From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jla-0000yD-5G for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:22:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7jlR-0003Da-3Z for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:22:26 -0400 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]:52309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jlQ-0003DH-SX for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:22:17 -0400 Received: by mail-pa0-f45.google.com with SMTP id eu11so3182927pac.4 for ; Thu, 17 Jul 2014 04:22:15 -0700 (PDT) From: Sanidhya Kashyap Date: Thu, 17 Jul 2014 16:51:14 +0530 Message-Id: <1405596081-29701-2-git-send-email-sanidhya.iiith@gmail.com> In-Reply-To: <1405596081-29701-1-git-send-email-sanidhya.iiith@gmail.com> References: <1405596081-29701-1-git-send-email-sanidhya.iiith@gmail.com> Subject: [Qemu-devel] [PATCH v4 1/8] enable sharing of the function between migration and bitmap dump List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Sanidhya Kashyap , "Dr. David Alan Gilbert" , Juan Quintela Added prefix qemu_ to the function as pointed out by Juan. Signed-off-by: Sanidhya Kashyap --- arch_init.c | 19 +++++++++++-------- include/exec/ram_addr.h | 4 ++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/arch_init.c b/arch_init.c index 8ddaf35..9ac4602 100644 --- a/arch_init.c +++ b/arch_init.c @@ -434,20 +434,22 @@ ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr, return (next - base) << TARGET_PAGE_BITS; } -static inline bool migration_bitmap_set_dirty(ram_addr_t addr) +static inline bool qemu_bitmap_set_dirty(ram_addr_t addr, unsigned long *bitmap, + bool migration_flag) { bool ret; int nr = addr >> TARGET_PAGE_BITS; - ret = test_and_set_bit(nr, migration_bitmap); + ret = test_and_set_bit(nr, bitmap); - if (!ret) { + if (!ret && migration_flag) { migration_dirty_pages++; } return ret; } -static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) +void qemu_bitmap_sync_range(ram_addr_t start, ram_addr_t length, + unsigned long *bitmap, bool migration_flag) { ram_addr_t addr; unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS); @@ -461,8 +463,8 @@ static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) for (k = page; k < page + nr; k++) { if (src[k]) { unsigned long new_dirty; - new_dirty = ~migration_bitmap[k]; - migration_bitmap[k] |= src[k]; + new_dirty = ~bitmap[k]; + bitmap[k] |= src[k]; new_dirty &= src[k]; migration_dirty_pages += ctpopl(new_dirty); src[k] = 0; @@ -476,7 +478,7 @@ static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) cpu_physical_memory_reset_dirty(start + addr, TARGET_PAGE_SIZE, DIRTY_MEMORY_MIGRATION); - migration_bitmap_set_dirty(start + addr); + qemu_bitmap_set_dirty(start + addr, bitmap, migration_flag); } } } @@ -512,7 +514,8 @@ static void migration_bitmap_sync(void) address_space_sync_dirty_bitmap(&address_space_memory); QTAILQ_FOREACH(block, &ram_list.blocks, next) { - migration_bitmap_sync_range(block->mr->ram_addr, block->length); + qemu_bitmap_sync_range(block->mr->ram_addr, block->length, + migration_bitmap, true); } trace_migration_bitmap_sync_end(migration_dirty_pages - num_dirty_pages_init); diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index e9eb831..a5809b4 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -151,5 +151,9 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t length, unsigned client); + +void qemu_bitmap_sync_range(ram_addr_t start, ram_addr_t length, + unsigned long *bitmap, bool migration_flag); + #endif #endif -- 1.9.3