From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:41723)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1QQbm4-0006JK-Cf
	for qemu-devel@nongnu.org; Sun, 29 May 2011 04:55:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1QQbm3-0007uB-9o
	for qemu-devel@nongnu.org; Sun, 29 May 2011 04:55:04 -0400
Received: from mx1.redhat.com ([209.132.183.28]:46508)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1QQbm3-0007u2-0h
	for qemu-devel@nongnu.org; Sun, 29 May 2011 04:55:03 -0400
Received: from int-mx12.intmail.prod.int.phx2.redhat.com
	(int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4T8t2LG030147
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Sun, 29 May 2011 04:55:02 -0400
Message-ID: <4DE209E2.9060109@redhat.com>
Date: Sun, 29 May 2011 11:54:58 +0300
From: Avi Kivity <avi@redhat.com>
MIME-Version: 1.0
References: <20110523213115.164535428@amt.cnet>
	<20110523213411.080716110@amt.cnet>
In-Reply-To: <20110523213411.080716110@amt.cnet>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [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: Marcelo Tosatti <mtosatti@redhat.com>
Cc: kwolf@redhat.com, Jes.Sorensen@redhat.com, dlaor@redhat.com, qemu-devel@nongnu.org

On 05/24/2011 12:31 AM, Marcelo Tosatti wrote:
> 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;
> +    }
> +

Changelog should state why the conflict exists.

-- 
error compiling committee.c: too many arguments to function