From: Doug Goldstein <cardoe@cardoe.com>
Date: Thu, 1 Nov 2012 22:15:35 +0000 (-0500)
Subject: qemu: QMP capabilities support starts with 1.2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ba804d9fd1e4a0b514375595c171f62ebced213d;p=people%2Fdariof%2Flibvirt.git

qemu: QMP capabilities support starts with 1.2

Per the code comment in qemuCapsInitQMPBasic() and commit 43e23c7, we
should only use QMP for capabilities probing starting with 1.2 and
newer.  The old code had dead logic that probed on 1.0 and newer.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 271273cba..9396a9b70 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2314,7 +2314,7 @@ qemuCapsInitQMP(qemuCapsPtr caps,
     VIR_DEBUG("Got version %d.%d.%d (%s)",
               major, minor, micro, NULLSTR(package));
 
-    if (!(major >= 1 || (major == 1 && minor >= 1))) {
+    if (major < 1 || (major == 1 && minor < 2)) {
         VIR_DEBUG("Not new enough for QMP capabilities detection");
         ret = 0;
         goto cleanup;