From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=42506 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Om6ub-0006hG-Td
	for qemu-devel@nongnu.org; Thu, 19 Aug 2010 11:20:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Om6ua-00061m-IK
	for qemu-devel@nongnu.org; Thu, 19 Aug 2010 11:20:13 -0400
Received: from mail-gw0-f45.google.com ([74.125.83.45]:52720)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Om6ua-0005vU-Fm
	for qemu-devel@nongnu.org; Thu, 19 Aug 2010 11:20:12 -0400
Received: by mail-gw0-f45.google.com with SMTP id 11so809227gwb.4
	for <qemu-devel@nongnu.org>; Thu, 19 Aug 2010 08:20:12 -0700 (PDT)
Message-ID: <4C6D4BA9.6080801@codemonkey.ws>
Date: Thu, 19 Aug 2010 10:20:09 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 4/4] savevm: Reset last block info at
	beginning of each save
References: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com>
	<1282223922-5971-5-git-send-email-lcapitulino@redhat.com>
In-Reply-To: <1282223922-5971-5-git-send-email-lcapitulino@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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: Luiz Capitulino <lcapitulino@redhat.com>
Cc: aliguori@us.ibm.com, Alex Williamson <alex.williamson@redhat.com>, qemu-devel@nongnu.org

On 08/19/2010 08:18 AM, Luiz Capitulino wrote:
> From: Alex Williamson<alex.williamson@redhat.com>
>
> 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>
> Acked-by: Glauber Costa<glommer@redhat.com>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   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) {
>