From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:60172)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1TF2ht-0001jn-Rw
	for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:51:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1TF2hn-0004A0-TG
	for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:51:45 -0400
Received: from mail-pb0-f45.google.com ([209.85.160.45]:35487)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1TF2hn-00049t-NC
	for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:51:39 -0400
Received: by pbbrp12 with SMTP id rp12so7616635pbb.4
	for <qemu-devel@nongnu.org>; Fri, 21 Sep 2012 05:51:39 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <505C62D5.7090103@redhat.com>
Date: Fri, 21 Sep 2012 14:51:33 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1348217255-22441-1-git-send-email-quintela@redhat.com>
	<1348217255-22441-38-git-send-email-quintela@redhat.com>
In-Reply-To: <1348217255-22441-38-git-send-email-quintela@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 37/41] block-migration: Switch meaning of
	return value
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: qemu-devel@nongnu.org

Il 21/09/2012 10:47, Juan Quintela ha scritto:
> Make consistent the result of blk_mig_save_dirty_block() and
> mig_save_device_dirty()
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  block-migration.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/block-migration.c b/block-migration.c
> index a822bb2..565628f 100644
> --- a/block-migration.c
> +++ b/block-migration.c
> @@ -429,14 +429,18 @@ error:
>      return 0;
>  }
> 
> +/* return value:
> + * 0: too much data for max_downtime
> + * 1: few enough data for max_downtime
> +*/
>  static int blk_mig_save_dirty_block(QEMUFile *f, int is_async)
>  {
>      BlkMigDevState *bmds;
> -    int ret = 0;
> +    int ret = 1;
> 
>      QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
> -        if (mig_save_device_dirty(f, bmds, is_async) == 0) {
> -            ret = 1;
> +        ret = mig_save_device_dirty(f, bmds, is_async);
> +        if (ret == 0) {
>              break;
>          }
>      }
> @@ -594,7 +598,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
>                  block_mig_state.bulk_completed = 1;
>              }
>          } else {
> -            if (blk_mig_save_dirty_block(f, 1) == 0) {
> +            if (blk_mig_save_dirty_block(f, 1) != 0) {
>                  /* no more dirty blocks */
>                  break;
>              }
> @@ -631,7 +635,7 @@ static int block_save_complete(QEMUFile *f, void *opaque)
>         all async read completed */
>      assert(block_mig_state.submitted == 0);
> 
> -    while (blk_mig_save_dirty_block(f, 0) != 0) {
> +    while (blk_mig_save_dirty_block(f, 0) == 0) {
>          /* Do nothing */
>      }
>      blk_mig_cleanup();
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>