|
 |
958e1b |
From 6bdff9954d46304a278bff833ecb15450c19c4f5 Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
958e1b |
Date: Thu, 8 May 2014 11:52:12 +0200
|
|
|
958e1b |
Subject: [PATCH 05/13] Disallow outward migration while awaiting incoming migration
|
|
|
958e1b |
MIME-Version: 1.0
|
|
|
958e1b |
Content-Type: text/plain; charset=UTF-8
|
|
|
958e1b |
Content-Transfer-Encoding: 8bit
|
|
|
958e1b |
|
|
|
958e1b |
RH-Author: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
958e1b |
Message-id: <1399549932-9977-1-git-send-email-dgilbert@redhat.com>
|
|
|
958e1b |
Patchwork-id: 58747
|
|
|
958e1b |
O-Subject: [RHEL7.1 qemu-kvm PATCH 1/1] Disallow outward migration while awaiting incoming migration
|
|
|
958e1b |
Bugzilla: 1086987
|
|
|
958e1b |
RH-Acked-by: Amos Kong <akong@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1086987
|
|
|
958e1b |
brew: https://brewweb.devel.redhat.com/taskinfo?taskID=7432751
|
|
|
958e1b |
upstream: ca99993adc9205c905dba5dc1bb819959ada7200
|
|
|
958e1b |
|
|
|
958e1b |
QEMU will assert if you attempt to start an outgoing migration on
|
|
|
958e1b |
a QEMU that's sitting waiting for an incoming migration (started
|
|
|
958e1b |
with -incoming), so disallow it with a proper error.
|
|
|
958e1b |
|
|
|
958e1b |
(This is a fix for https://bugzilla.redhat.com/show_bug.cgi?id=1086987 )
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
958e1b |
Reviewed-by: Andreas Färber <afaerber@suse.de>
|
|
|
958e1b |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
958e1b |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
958e1b |
(cherry picked from commit ca99993adc9205c905dba5dc1bb819959ada7200)
|
|
|
958e1b |
---
|
|
|
958e1b |
migration.c | 5 +++++
|
|
|
958e1b |
1 file changed, 5 insertions(+)
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
migration.c | 5 +++++
|
|
|
958e1b |
1 files changed, 5 insertions(+), 0 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/migration.c b/migration.c
|
|
|
958e1b |
index 7efbd25..44b993a 100644
|
|
|
958e1b |
--- a/migration.c
|
|
|
958e1b |
+++ b/migration.c
|
|
|
958e1b |
@@ -430,6 +430,11 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
|
|
|
958e1b |
return;
|
|
|
958e1b |
}
|
|
|
958e1b |
|
|
|
958e1b |
+ if (runstate_check(RUN_STATE_INMIGRATE)) {
|
|
|
958e1b |
+ error_setg(errp, "Guest is waiting for an incoming migration");
|
|
|
958e1b |
+ return;
|
|
|
958e1b |
+ }
|
|
|
958e1b |
+
|
|
|
958e1b |
if (qemu_savevm_state_blocked(errp)) {
|
|
|
958e1b |
return;
|
|
|
958e1b |
}
|
|
|
958e1b |
--
|
|
|
958e1b |
1.7.1
|
|
|
958e1b |
|