Re: [Qemu-devel] [patch 7/7] do not allow migration if block copy in progress

[Avi Kivity]

On 05/24/2011 12:31 AM, Marcelo Tosatti wrote:

Signed-off-by: Marcelo Tosatti<mtosa...@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