From patchwork Thu Dec 16 17:44:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 75792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 68DD51007D3 for ; Fri, 17 Dec 2010 05:53:42 +1100 (EST) Received: from localhost ([127.0.0.1]:51317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTIxP-0008JF-FX for incoming@patchwork.ozlabs.org; Thu, 16 Dec 2010 13:53:39 -0500 Received: from [140.186.70.92] (port=49150 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTIvN-0007Up-Up for qemu-devel@nongnu.org; Thu, 16 Dec 2010 13:51:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTIvM-0008Pk-UH for qemu-devel@nongnu.org; Thu, 16 Dec 2010 13:51:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTIvM-0008PZ-M1 for qemu-devel@nongnu.org; Thu, 16 Dec 2010 13:51:32 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBGIpLVh015271 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Dec 2010 13:51:30 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBGHpDRZ026917; Thu, 16 Dec 2010 12:51:13 -0500 Received: from amt.cnet (vpn2-9-217.ams2.redhat.com [10.36.9.217]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBGHpBcE018633; Thu, 16 Dec 2010 12:51:12 -0500 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 104D165206D; Thu, 16 Dec 2010 15:50:22 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id oBGHoJse022143; Thu, 16 Dec 2010 15:50:19 -0200 Message-Id: <20101216174810.740347376@redhat.com> User-Agent: quilt/0.47-1 Date: Thu, 16 Dec 2010 15:44:22 -0200 From: Marcelo Tosatti To: qemu-devel@nongnu.org References: <20101216174419.090204390@redhat.com> Content-Disposition: inline; filename=blockcopy-active X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf , Anthony Liguori , Marcelo Tosatti Subject: [Qemu-devel] [patch 3/3] do not allow migration if block copy in progress X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Marcelo Tosatti Index: qemu-kvm-block-copy/migration.c =================================================================== --- qemu-kvm-block-copy.orig/migration.c +++ qemu-kvm-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 @@ -88,6 +89,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);