From patchwork Thu Oct 18 07:29:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 192241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B30602C009F for ; Thu, 18 Oct 2012 19:50:22 +1100 (EST) Received: from localhost ([::1]:41283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZp-0006Br-3Z for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 03:31:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZC-00054J-Rc for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOkZ5-0000PL-2f for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:30:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZ4-0000P1-P5 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:30:46 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9I7Uecb028838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Oct 2012 03:30:46 -0400 Received: from trasno.mitica (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q9I7URnL020816; Thu, 18 Oct 2012 03:30:36 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 09:29:58 +0200 Message-Id: <1350545426-23172-3-git-send-email-quintela@redhat.com> In-Reply-To: <1350545426-23172-1-git-send-email-quintela@redhat.com> References: <1350545426-23172-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Umesh Deshpande Subject: [Qemu-devel] [PATCH 02/30] add a version number to ram_list X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Umesh Deshpande This will be used to detect if last_block might have become invalid across different calls to ram_save_live. Signed-off-by: Paolo Bonzini Signed-off-by: Umesh Deshpande Signed-off-by: Juan Quintela Reviewed-by: Orit Wasserman --- arch_init.c | 7 ++++++- cpu-all.h | 1 + exec.c | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index 4293557..b47313d 100644 --- a/arch_init.c +++ b/arch_init.c @@ -336,6 +336,7 @@ static RAMBlock *last_block; static ram_addr_t last_offset; static unsigned long *migration_bitmap; static uint64_t migration_dirty_pages; +static uint32_t last_version; static inline bool migration_bitmap_test_and_reset_dirty(MemoryRegion *mr, ram_addr_t offset) @@ -406,7 +407,6 @@ static void migration_bitmap_sync(void) } } - /* * ram_save_block: Writes a page of memory to the stream f * @@ -558,6 +558,7 @@ static void reset_ram_globals(void) { last_block = NULL; last_offset = 0; + last_version = ram_list.version; sort_ram_list(); } @@ -613,6 +614,10 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) uint64_t expected_downtime; MigrationState *s = migrate_get_current(); + if (ram_list.version != last_version) { + reset_ram_globals(); + } + bytes_transferred_last = bytes_transferred; bwidth = qemu_get_clock_ns(rt_clock); diff --git a/cpu-all.h b/cpu-all.h index 6558a6f..e07c91c 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -500,6 +500,7 @@ typedef struct RAMBlock { typedef struct RAMList { uint8_t *phys_dirty; + uint32_t version; QLIST_HEAD(, RAMBlock) blocks_mru; QLIST_HEAD(, RAMBlock) blocks; } RAMList; diff --git a/exec.c b/exec.c index 718bbc2..1e04711 100644 --- a/exec.c +++ b/exec.c @@ -637,7 +637,6 @@ bool tcg_enabled(void) void cpu_exec_init_all(void) { #if !defined(CONFIG_USER_ONLY) - qemu_mutex_init(&ram_list.mutex); memory_map_init(); io_mem_init(); #endif @@ -2575,6 +2574,8 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, QLIST_INSERT_HEAD(&ram_list.blocks, new_block, next); QLIST_INSERT_HEAD(&ram_list.blocks_mru, new_block, next_mru); + ram_list.version++; + ram_list.phys_dirty = g_realloc(ram_list.phys_dirty, last_ram_offset() >> TARGET_PAGE_BITS); memset(ram_list.phys_dirty + (new_block->offset >> TARGET_PAGE_BITS), @@ -2602,6 +2603,7 @@ void qemu_ram_free_from_ptr(ram_addr_t addr) if (addr == block->offset) { QLIST_REMOVE(block, next); QLIST_REMOVE(block, next_mru); + ram_list.version++; g_free(block); return; } @@ -2616,6 +2618,7 @@ void qemu_ram_free(ram_addr_t addr) if (addr == block->offset) { QLIST_REMOVE(block, next); QLIST_REMOVE(block, next_mru); + ram_list.version++; if (block->flags & RAM_PREALLOC_MASK) { ; } else if (mem_path) {