From patchwork Mon Jan 5 11:51:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 425307 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DD98614007F for ; Mon, 5 Jan 2015 22:58:23 +1100 (AEDT) Received: from localhost ([::1]:59933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y86Ig-00061H-4O for incoming@patchwork.ozlabs.org; Mon, 05 Jan 2015 06:58:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y86Cz-0003jN-Fz for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:52:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y86Cu-0007cB-IA for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:52:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50448) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y86Cu-0007bv-Bi for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:52:24 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t05BqMhH031314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 5 Jan 2015 06:52:22 -0500 Received: from localhost (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t05BqLpm027142; Mon, 5 Jan 2015 06:52:21 -0500 From: Stefan Hajnoczi To: Date: Mon, 5 Jan 2015 11:51:36 +0000 Message-Id: <1420458696-1885-20-git-send-email-stefanha@redhat.com> In-Reply-To: <1420458696-1885-1-git-send-email-stefanha@redhat.com> References: <1420458696-1885-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 19/19] migration/block: fix pending() 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 From: Vladimir Sementsov-Ogievskiy Because of wrong return value of .save_live_pending() in migration/block.c, migration finishes before the whole disk is transferred. Such situation occurs when the migration process is fast enough, for example when source and dest are on the same host. If in the bulk phase we return something < max_size, we will skip transferring the tail of the device. Currently we have "set pending to BLOCK_SIZE if it is zero" for bulk phase, but there no guarantee, that it will be < max_size. True approach is to return, for example, max_size+1 when we are in the bulk phase. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-id: 1419933856-4018-2-git-send-email-vsementsov@parallels.com Signed-off-by: Stefan Hajnoczi --- migration/block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/block.c b/migration/block.c index a0f908c..0c76106 100644 --- a/migration/block.c +++ b/migration/block.c @@ -766,8 +766,8 @@ static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) block_mig_state.read_done * BLOCK_SIZE; /* Report at least one block pending during bulk phase */ - if (pending == 0 && !block_mig_state.bulk_completed) { - pending = BLOCK_SIZE; + if (pending <= max_size && !block_mig_state.bulk_completed) { + pending = max_size + BLOCK_SIZE; } blk_mig_unlock(); qemu_mutex_unlock_iothread();