From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:49315)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RBXLK-0004RE-BH
	for qemu-devel@nongnu.org; Wed, 05 Oct 2011 15:41:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RBXLJ-00066h-AZ
	for qemu-devel@nongnu.org; Wed, 05 Oct 2011 15:41:26 -0400
Received: from mail-yw0-f45.google.com ([209.85.213.45]:54431)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RBXLJ-00066Q-50
	for qemu-devel@nongnu.org; Wed, 05 Oct 2011 15:41:25 -0400
Received: by ywm39 with SMTP id 39so2315431ywm.4
	for <qemu-devel@nongnu.org>; Wed, 05 Oct 2011 12:41:23 -0700 (PDT)
Message-ID: <4E8CB2E0.2000701@codemonkey.ws>
Date: Wed, 05 Oct 2011 14:41:20 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <cover.1317738629.git.quintela@redhat.com>
	<b7364a48b984bf28cd7f64c01d60ddcbbc76a189.1317738629.git.quintela@redhat.com>
In-Reply-To: <b7364a48b984bf28cd7f64c01d60ddcbbc76a189.1317738629.git.quintela@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/4] savevm: teach qemu_fill_buffer to do
 partial refills
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Juan Quintela <quintela@redhat.com>
Cc: pbonzini@redhat.com, qemu-devel@nongnu.org

On 10/04/2011 09:38 AM, Juan Quintela wrote:
> We will need on next patch to be able to lookahead on next patch
>
> Signed-off-by: Juan Quintela<quintela@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>   savevm.c |   14 +++++++++++---
>   1 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/savevm.c b/savevm.c
> index 46f2447..31131df 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -455,6 +455,7 @@ void qemu_fflush(QEMUFile *f)
>   static void qemu_fill_buffer(QEMUFile *f)
>   {
>       int len;
> +    int used;
>
>       if (!f->get_buffer)
>           return;
> @@ -462,10 +463,17 @@ static void qemu_fill_buffer(QEMUFile *f)
>       if (f->is_write)
>           abort();
>
> -    len = f->get_buffer(f->opaque, f->buf, f->buf_offset, IO_BUF_SIZE);
> +    used = f->buf_size - f->buf_index;
> +    if (used>  0) {
> +        memmove(f->buf, f->buf + f->buf_index, used);
> +    }
> +    f->buf_index = 0;
> +    f->buf_size = used;
> +
> +    len = f->get_buffer(f->opaque, f->buf + used, f->buf_offset,
> +                        IO_BUF_SIZE - used);
>       if (len>  0) {
> -        f->buf_index = 0;
> -        f->buf_size = len;
> +        f->buf_size += len;
>           f->buf_offset += len;
>       } else if (len != -EAGAIN)
>           f->has_error = 1;