From patchwork Fri Jul 20 19:32:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 172348 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 B76882C0339 for ; Sat, 21 Jul 2012 07:05:16 +1000 (EST) Received: from localhost ([::1]:53819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsKNu-0002bm-OP for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 17:05:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsIyF-0007Hq-Vu for qemu-devel@nongnu.org; Fri, 20 Jul 2012 15:36:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsIwP-0002bm-Pe for qemu-devel@nongnu.org; Fri, 20 Jul 2012 15:34:39 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:35320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsIwP-0002Vt-If for qemu-devel@nongnu.org; Fri, 20 Jul 2012 15:32:45 -0400 Received: by mail-we0-f173.google.com with SMTP id z53so2920397wey.4 for ; Fri, 20 Jul 2012 12:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ZSAopXBQKxVjenzD9Fuqdk6pgSetfdLxe98e3yPEjIg=; b=uyZp/RBpKjO6JJ30d9CXt+QNHDmzXMLnwbNcI5yOAWldlmM2VorYwtV4TR1njgWpAj TqKMlm2PS8dMdWM3MfVuV8xFCvgWCMVyvODKKecu0cfXDJAicwR/mybFIR7rpgM0dxPB iukssGuCG8CY+kk/Emzuz1FqRQobaGv1/yenSeerZfMbnyLOe2IKMxzUoccNC6qUpV2n cCi0bzyRCc/8hgp1i/Cn78/YzmGlNr6ZZHNkoYFaB+hyYopq6VfrJySQEdhygBsnsUii hx8vA3mt/uX2O0yZ+biafaTTzt+lxqj+rfFwnlm/RARRFvDLPVU5xeJ845XgA52mkYEj 8r2A== Received: by 10.180.78.4 with SMTP id x4mr17694529wiw.19.1342812765113; Fri, 20 Jul 2012 12:32:45 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id o2sm17624838wiz.11.2012.07.20.12.32.43 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jul 2012 12:32:44 -0700 (PDT) From: benoit.canet@gmail.com To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2012 21:32:37 +0200 Message-Id: <1342812757-2651-4-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342812757-2651-1-git-send-email-benoit@irqsave.net> References: <1342812757-2651-1-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 X-Mailman-Approved-At: Fri, 20 Jul 2012 17:04:40 -0400 Cc: stefanha@gmail.com, stefanha@linux.vnet.ibm.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [PATCH 3/3] migration: block migration when streaming block jobs are running. 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: Benoît Canet Signed-off-by: Benoit Canet --- migration.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/migration.c b/migration.c index 8db1b43..dfce680 100644 --- a/migration.c +++ b/migration.c @@ -425,6 +425,11 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, return; } + if (bdrv_have_block_jobs()) { + error_set(errp, QERR_STREAMING_BLOCKS_MIGRATION); + return; + } + s = migrate_init(¶ms); if (strstart(uri, "tcp:", &p)) {