From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40049 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om51S-0007xU-8F for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Om51N-0000xy-8O for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53992) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Om51N-0000xo-0T for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:05 -0400 From: Luiz Capitulino Date: Thu, 19 Aug 2010 10:18:42 -0300 Message-Id: <1282223922-5971-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com> References: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] savevm: Reset last block info at beginning of each save List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Alex Williamson , qemu-devel@nongnu.org From: Alex Williamson If we save more than once we need to reset the last block info or else only the first save has the actual block info and each subsequent save will only use continue flags, making them unloadable independently. Found-by: Miguel Di Ciurcio Filho Signed-off-by: Alex Williamson Acked-by: Glauber Costa Signed-off-by: Luiz Capitulino --- arch_init.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index 47bb4b2..e0bd18c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -104,10 +104,11 @@ static int is_dup_page(uint8_t *page, uint8_t ch) return 1; } +static RAMBlock *last_block; +static ram_addr_t last_offset; + static int ram_save_block(QEMUFile *f) { - static RAMBlock *last_block = NULL; - static ram_addr_t last_offset = 0; RAMBlock *block = last_block; ram_addr_t offset = last_offset; ram_addr_t current_addr; @@ -231,6 +232,8 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) if (stage == 1) { RAMBlock *block; bytes_transferred = 0; + last_block = NULL; + last_offset = 0; /* Make sure all dirty bits are set */ QLIST_FOREACH(block, &ram_list.blocks, next) { -- 1.7.2.1.97.g3235b