From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 20 Oct 2021 07:03:04 +0000 (+0200)
Subject: qemuMonitorJSONGetMigrationCapabilities: Don't return early on CommandNotFound
X-Git-Tag: v7.9.0-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=945942ebba943e6addd6c8163d6e38a4a7df7b8f;p=thirdparty%2Flibvirt.git

qemuMonitorJSONGetMigrationCapabilities: Don't return early on CommandNotFound

The qemuMonitorJSONGetMigrationCapabilities() command executes
'query-migrate-capabilities' command and returns early if QEMU
doesn't know the command. Well, the command was introduced in
QEMU release 1.2 (specifically in commit v1.2.0-rc0~29^2~11) and
since the minimum required version is 2.11.0 we can be sure that
command will always exist.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 586b30763b..a7a980fccd 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6518,9 +6518,6 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitor *mon,
     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
         return -1;
 
-    if (qemuMonitorJSONHasError(reply, "CommandNotFound"))
-        return 0;
-
     if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
         return -1;