summary refs log tree commit diff stats
path: root/migration.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-01-20 09:05:37 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-01-20 09:05:37 -0600
commit5dbbda340533cd7d217dcf3ab904fb353598cbde (patch)
tree1e0bc27430f12e9f27bdd466a21072802f7cbbb5 /migration.c
parentd788b57051ee91aa39de67cff8d8e15953bc100c (diff)
parente10990c3f0c39e92ab5f74004b89a24fcc36fa14 (diff)
downloadfocaccia-qemu-5dbbda340533cd7d217dcf3ab904fb353598cbde.tar.gz
focaccia-qemu-5dbbda340533cd7d217dcf3ab904fb353598cbde.zip
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'migration.c')
-rw-r--r--migration.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/migration.c b/migration.c
index e5ba51c314..d593b1df5d 100644
--- a/migration.c
+++ b/migration.c
@@ -88,6 +88,10 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
         return -1;
     }
 
+    if (qemu_savevm_state_blocked(mon)) {
+        return -1;
+    }
+
     if (strstart(uri, "tcp:", &p)) {
         s = tcp_start_outgoing_migration(mon, p, max_throttle, detach,
                                          blk, inc);