From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=51313 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Oh5st-0004iS-OG
	for qemu-devel@nongnu.org; Thu, 05 Aug 2010 15:13:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <alex.williamson@redhat.com>) id 1Oh5ss-0004qK-Lr
	for qemu-devel@nongnu.org; Thu, 05 Aug 2010 15:13:43 -0400
Received: from mx1.redhat.com ([209.132.183.28]:46149)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alex.williamson@redhat.com>) id 1Oh5ss-0004q0-E9
	for qemu-devel@nongnu.org; Thu, 05 Aug 2010 15:13:42 -0400
From: Alex Williamson <alex.williamson@redhat.com>
In-Reply-To: <20100720141808.9372.30011.stgit@localhost6.localdomain6>
References: <20100720141808.9372.30011.stgit@localhost6.localdomain6>
Content-Type: text/plain; charset="UTF-8"
Date: Thu, 05 Aug 2010 13:13:34 -0600
Message-ID: <1281035614.6598.312.camel@x201>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] savevm: Reset last block info at beginning
	of each save
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: miguel.filho@gmail.com

Bump, this really should make 0.13.  Thanks,

Alex

On Tue, 2010-07-20 at 08:19 -0600, Alex Williamson wrote:
> 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 <miguel.filho@gmail.com>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
> 
> 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) {
>