From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 21 Dec 2009 20:49:43 +0000 (+0000)
Subject: Disable JSON mode monitor until QEMU is more mature
X-Git-Tag: v0.7.5~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27c357bcfa72c819654500ba2cdadb62629b59a4;p=thirdparty%2Flibvirt.git

Disable JSON mode monitor until QEMU is more mature

* src/qemu/qemu_conf.h: Remove QEMU_CMD_FLAG_0_12 and just leave
  the lone JSON flag
* src/qemu/qemu_conf.c: Enable JSON on QEMU 0.13 or later, but
  leave it disabled for now
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 3f6c79b124..f53c1f722f 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1146,8 +1146,12 @@ static unsigned int qemudComputeCmdFlags(const char *help,
     if (version >= 10000)
         flags |= QEMUD_CMD_FLAG_0_10;
 
-    if (version >= 12000)
-        flags |= QEMUD_CMD_FLAG_0_12;
+    /* Keep disabled till we're actually ready to turn on JSON mode
+     * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */
+#if 0
+    if (version >= 13000)
+        flags |= QEMUD_CMD_FLAG_MONITOR_JSON;
+#endif
 
     return flags;
 }
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index e958850b30..209cd31050 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -76,8 +76,7 @@ enum qemud_cmd_flags {
     QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX = (1 << 21), /* Does qemu support unix domain sockets for migration? */
     QEMUD_CMD_FLAG_CHARDEV       = (1 << 22), /* Is the new -chardev arg available */
     QEMUD_CMD_FLAG_ENABLE_KVM    = (1 << 23), /* Is the -enable-kvm flag available to "enable KVM full virtualization support" */
-    QEMUD_CMD_FLAG_0_12          = (1 << 24),
-    QEMUD_CMD_FLAG_MONITOR_JSON  = QEMUD_CMD_FLAG_0_12, /* JSON mode for monitor */
+    QEMUD_CMD_FLAG_MONITOR_JSON  = (1 << 24), /* JSON mode for monitor */
 };
 
 /* Main driver state */