[Qemu-devel] [patch 1/7] add migration_active function

2011-06-06 Thread Marcelo Tosatti 
To query whether migration is active.

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
@@ -85,8 +85,8 @@ int do_migrate(Monitor *mon, const QDict
 int inc = qdict_get_try_bool(qdict, inc, 0);
 const char *uri = qdict_get_str(qdict, uri);
 
-if (current_migration 
-current_migration-get_status(current_migration) == MIG_STATE_ACTIVE) {
+
+if (migration_active()) {
 monitor_printf(mon, migration already in progress\n);
 return -1;
 }
@@ -480,3 +480,13 @@ int get_migration_state(void)
 return MIG_STATE_ERROR;
 }
 }
+
+bool migration_active(void)
+{
+if (current_migration 
+current_migration-get_status(current_migration) == MIG_STATE_ACTIVE) {
+return true;
+}
+
+return false;
+}
Index: qemu-block-copy/migration.h
===
--- qemu-block-copy.orig/migration.h
+++ qemu-block-copy/migration.h
@@ -148,4 +148,6 @@ int ram_load(QEMUFile *f, void *opaque, 
 
 extern int incoming_expected;
 
+bool migration_active(void);
+
 #endif

Re: [Qemu-devel] [patch 1/7] add migration_active function

2011-05-29 Thread Jes Sorensen 
On 05/24/11 06:31, Marcelo Tosatti wrote:
 To query whether migration is active.
 
 Signed-off-by: Marcelo Tosatti mtosa...@redhat.com

ACK

Jes

Re: [Qemu-devel] [patch 1/7] add migration_active function

2011-05-27 Thread Kevin Wolf 
Am 23.05.2011 23:31, schrieb Marcelo Tosatti:
 To query whether migration is active.
 
 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
 @@ -480,3 +480,13 @@ int get_migration_state(void)
  return MIG_STATE_ERROR;
  }
  }
 +
 +bool migration_active(void)
 +{
 +if (current_migration 
 +current_migration-get_status(current_migration) == 
 MIG_STATE_ACTIVE) {
 +return true;
 +}
 +
 +return false;
 +}

The very same check already exists open-coded in do_migrate(). Maybe we
should convert it now that a function is available for it?

Kevin

[Qemu-devel] [patch 1/7] add migration_active function

2011-05-23 Thread Marcelo Tosatti 
To query whether migration is active.

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
@@ -480,3 +480,13 @@ int get_migration_state(void)
 return MIG_STATE_ERROR;
 }
 }
+
+bool migration_active(void)
+{
+if (current_migration 
+current_migration-get_status(current_migration) == MIG_STATE_ACTIVE) {
+return true;
+}
+
+return false;
+}
Index: qemu-block-copy/migration.h
===
--- qemu-block-copy.orig/migration.h
+++ qemu-block-copy/migration.h
@@ -148,4 +148,6 @@ int ram_load(QEMUFile *f, void *opaque, 
 
 extern int incoming_expected;
 
+bool migration_active(void);
+
 #endif