From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB1qT-0001R8-50 for qemu-devel@nongnu.org; Tue, 13 Jan 2015 08:49:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YB1qN-0006CP-1E for qemu-devel@nongnu.org; Tue, 13 Jan 2015 08:49:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB1qM-0006By-Qa for qemu-devel@nongnu.org; Tue, 13 Jan 2015 08:49:14 -0500 From: Stefan Hajnoczi Date: Tue, 13 Jan 2015 13:47:57 +0000 Message-Id: <1421156896-11599-20-git-send-email-stefanha@redhat.com> In-Reply-To: <1421156896-11599-1-git-send-email-stefanha@redhat.com> References: <1421156896-11599-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL v3 19/38] migration/block: fix pending() return value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi 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(); -- 2.1.0