From patchwork Tue Jul 20 14:19:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 59316 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 22212B6EF7 for ; Wed, 21 Jul 2010 00:25:27 +1000 (EST) Received: from localhost ([127.0.0.1]:35526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ObDhl-0004BU-Vu for incoming@patchwork.ozlabs.org; Tue, 20 Jul 2010 10:21:57 -0400 Received: from [140.186.70.92] (port=51672 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ObDg5-0001k1-GV for qemu-devel@nongnu.org; Tue, 20 Jul 2010 10:20:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ObDfc-00016s-Ua for qemu-devel@nongnu.org; Tue, 20 Jul 2010 10:19:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44382) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ObDfc-00016N-O4 for qemu-devel@nongnu.org; Tue, 20 Jul 2010 10:19:44 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6KEJWYm026823 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Jul 2010 10:19:32 -0400 Received: from localhost6.localdomain6 (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6KEJVjM019692; Tue, 20 Jul 2010 10:19:31 -0400 From: Alex Williamson To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Tue, 20 Jul 2010 08:19:31 -0600 Message-ID: <20100720141808.9372.30011.stgit@localhost6.localdomain6> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com, miguel.filho@gmail.com Subject: [Qemu-devel] [PATCH] savevm: Reset last block info at beginning of each save X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- Anthony, this fixes a regression caused by the new migration code and should be queued for 0.13. Thanks, Alex 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) {