From patchwork Tue Feb 16 16:14:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 583507 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 3078A1402D8 for ; Wed, 17 Feb 2016 03:18:43 +1100 (AEDT) Received: from localhost ([::1]:47535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aViKn-0000Eq-56 for incoming@patchwork.ozlabs.org; Tue, 16 Feb 2016 11:18:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aViHt-000406-MX for qemu-devel@nongnu.org; Tue, 16 Feb 2016 11:15:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aViHp-00021a-9B for qemu-devel@nongnu.org; Tue, 16 Feb 2016 11:15:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aViHp-00021J-28 for qemu-devel@nongnu.org; Tue, 16 Feb 2016 11:15:37 -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 (Postfix) with ESMTPS id AF0A2E1B88 for ; Tue, 16 Feb 2016 16:15:36 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-4-188.ams2.redhat.com [10.36.4.188]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1GGFPtR003433; Tue, 16 Feb 2016 11:15:35 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 16 Feb 2016 16:14:57 +0000 Message-Id: <1455639318-26578-7-git-send-email-berrange@redhat.com> In-Reply-To: <1455639318-26578-1-git-send-email-berrange@redhat.com> References: <1455639318-26578-1-git-send-email-berrange@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: Amit Shah , "Dr. David Alan Gilbert" , Juan Quintela Subject: [Qemu-devel] [PATCH v2 06/27] migration: force QEMUFile to blocking mode for outgoing migration 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 Instead of relying on the default QEMUFile I/O blocking flag state, explicitly turn on blocking I/O for outgoing migration since it takes place in a background thread. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrange --- migration/migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/migration/migration.c b/migration/migration.c index 3701bd6..cd56000 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1746,6 +1746,7 @@ void migrate_fd_connect(MigrationState *s) s->expected_downtime = max_downtime/1000000; s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s); + qemu_file_set_blocking(s->to_dst_file, true); qemu_file_set_rate_limit(s->to_dst_file, s->bandwidth_limit / XFER_LIMIT_RATIO);