From patchwork Sun Feb 10 22:12:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 219525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 42D902C02EB for ; Mon, 11 Feb 2013 09:14:09 +1100 (EST) Received: from localhost ([::1]:45111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4f9z-0003cv-99 for incoming@patchwork.ozlabs.org; Sun, 10 Feb 2013 17:14:07 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4f9l-0003U6-Ev for qemu-devel@nongnu.org; Sun, 10 Feb 2013 17:13:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4f9g-0001Hh-5q for qemu-devel@nongnu.org; Sun, 10 Feb 2013 17:13:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4f9f-0001HK-Ug for qemu-devel@nongnu.org; Sun, 10 Feb 2013 17:13:48 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1AMDg9P032281 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 10 Feb 2013 17:13:42 -0500 Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1AMDfls020600; Sun, 10 Feb 2013 17:13:42 -0500 From: Stefan Hajnoczi To: Date: Sun, 10 Feb 2013 23:12:46 +0100 Message-Id: <1360534366-26723-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1360534366-26723-1-git-send-email-stefanha@redhat.com> References: <1360534366-26723-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , david.pravec@nethost.cz, Juan Quintela , Michael Roth , Stefan Hajnoczi , Paolo Bonzini Subject: [Qemu-devel] [PATCH for-1.4 stable v2 3/3] block-migration: fix block_save_iterate() return value X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The .save_live_iterate() function returns 0 to continue iterating or 1 to stop iterating. Since 16310a3cca7320edb9341c976f7819de0a8c27e0 it only ever returns 0, leading to an infinite loop. Return 1 if we have finished sending dirty blocks. Signed-off-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini --- block-migration.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block-migration.c b/block-migration.c index a91d96b..bcd0039 100644 --- a/block-migration.c +++ b/block-migration.c @@ -582,7 +582,12 @@ static int block_save_iterate(QEMUFile *f, void *opaque) qemu_put_be64(f, BLK_MIG_FLAG_EOS); - return 0; + /* Complete when bulk transfer is done and all dirty blocks have been + * transferred. + */ + return block_mig_state.bulk_completed && + block_mig_state.submitted == 0 && + block_mig_state.read_done == 0; } static int block_save_complete(QEMUFile *f, void *opaque)