From: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: Mon, 14 Apr 2014 16:03:59 +0000 (+0100)
Subject: Disallow outward migration while awaiting incoming migration
X-Git-Tag: qemu-xen-4.6.0-rc1~473^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ca99993adc9205c905dba5dc1bb819959ada7200;p=qemu-upstream-4.6-testing.git

Disallow outward migration while awaiting incoming migration

QEMU will assert if you attempt to start an outgoing migration on
a QEMU that's sitting waiting for an incoming migration (started
with -incoming), so disallow it with a proper error.

(This is a fix for https://bugzilla.redhat.com/show_bug.cgi?id=1086987 )

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration.c b/migration.c
index bd1fb912a..ac232758b 100644
--- a/migration.c
+++ b/migration.c
@@ -419,6 +419,11 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
         return;
     }
 
+    if (runstate_check(RUN_STATE_INMIGRATE)) {
+        error_setg(errp, "Guest is waiting for an incoming migration");
+        return;
+    }
+
     if (qemu_savevm_state_blocked(errp)) {
         return;
     }