From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:50530)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1QTdH1-0006FX-1K
	for qemu-devel@nongnu.org; Mon, 06 Jun 2011 13:07:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1QTdGz-0002lZ-B9
	for qemu-devel@nongnu.org; Mon, 06 Jun 2011 13:07:30 -0400
Received: from mx1.redhat.com ([209.132.183.28]:36544)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1QTdGy-0002lO-Qu
	for qemu-devel@nongnu.org; Mon, 06 Jun 2011 13:07:29 -0400
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p56H73Fe022485
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Mon, 6 Jun 2011 13:07:28 -0400
Message-Id: <20110606165823.918331609@amt.cnet>
Date: Mon, 06 Jun 2011 13:55:43 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
References: <20110606165536.581119615@amt.cnet>
Content-Disposition: inline;
	filename=3-3-do-not-allow-migration-if-block-copy-in-progress.patch
Subject: [Qemu-devel] [patch 7/7] do not allow migration if block copy in
	progress
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, Marcelo Tosatti <mtosatti@redhat.com>, Jes.Sorensen@redhat.com, dlaor@redhat.com, avi@redhat.com, jdenemar@redhat.com

Disable live migration with in progress live copy, due to:

- Conflict with block migration.
- Block copy does not support migration ATM.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu-block-copy/migration.c
===================================================================
--- qemu-block-copy.orig/migration.c
+++ qemu-block-copy/migration.c
@@ -19,6 +19,7 @@
 #include "block.h"
 #include "qemu_socket.h"
 #include "block-migration.h"
+#include "block-copy.h"
 #include "qemu-objects.h"
 
 //#define DEBUG_MIGRATION
@@ -95,6 +96,11 @@ int do_migrate(Monitor *mon, const QDict
         return -1;
     }
 
+    if (block_copy_active()) {
+        monitor_printf(mon, "block copy in progress\n");
+        return -1;
+    }
+
     if (strstart(uri, "tcp:", &p)) {
         s = tcp_start_outgoing_migration(mon, p, max_throttle, detach,
                                          blk, inc);