|
 |
3e5111 |
From 2d8e0d2cc979534be0149841e8bed07c0a4ba048 Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <2d8e0d2cc979534be0149841e8bed07c0a4ba048@dist-git>
|
|
|
3e5111 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
Date: Thu, 27 Apr 2017 10:38:41 +0200
|
|
|
3e5111 |
Subject: [PATCH] qemu: Ignore missing query-migrate-parameters
|
|
|
3e5111 |
|
|
|
3e5111 |
Migration with old QEMU which does not support query-migrate-parameters
|
|
|
3e5111 |
would fail because the QMP command is called unconditionally since the
|
|
|
3e5111 |
introduction of TLS migration. Previously it was only called if the user
|
|
|
3e5111 |
explicitly requested a feature which uses QEMU migration parameters. And
|
|
|
3e5111 |
even then the situation was not ideal, instead of reporting an
|
|
|
3e5111 |
unsupported feature we'd just complain about missing QMP command.
|
|
|
3e5111 |
|
|
|
3e5111 |
Trivially no migration parameters are supported when
|
|
|
3e5111 |
query-migrate-parameters QMP command is missing. There's no need to
|
|
|
3e5111 |
report an error if it is missing, the callers will report better error
|
|
|
3e5111 |
if needed.
|
|
|
3e5111 |
|
|
|
3e5111 |
https://bugzilla.redhat.com/show_bug.cgi?id=1441934
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
(cherry picked from commit ac58c036065ff1d53bc05b796093287c27c71762)
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
---
|
|
|
3e5111 |
src/qemu/qemu_monitor_json.c | 5 +++++
|
|
|
3e5111 |
1 file changed, 5 insertions(+)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
|
|
|
3e5111 |
index 405f79fec..601aa3e74 100644
|
|
|
3e5111 |
--- a/src/qemu/qemu_monitor_json.c
|
|
|
3e5111 |
+++ b/src/qemu/qemu_monitor_json.c
|
|
|
3e5111 |
@@ -2666,6 +2666,11 @@ qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon,
|
|
|
3e5111 |
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
|
|
|
3e5111 |
goto cleanup;
|
|
|
3e5111 |
|
|
|
3e5111 |
+ if (qemuMonitorJSONHasError(reply, "CommandNotFound")) {
|
|
|
3e5111 |
+ ret = 0;
|
|
|
3e5111 |
+ goto cleanup;
|
|
|
3e5111 |
+ }
|
|
|
3e5111 |
+
|
|
|
3e5111 |
if (qemuMonitorJSONCheckError(cmd, reply) < 0)
|
|
|
3e5111 |
goto cleanup;
|
|
|
3e5111 |
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.12.2
|
|
|
3e5111 |
|