From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 20 Oct 2010 17:37:43 +0000 (+0100)
Subject: Enable JSON and netdev features in QEMU >= 0.13
X-Git-Tag: v0.8.5~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa1e3f670672fef50b8263e52e20743969266aaf;p=thirdparty%2Flibvirt.git

Enable JSON and netdev features in QEMU >= 0.13

The QEMU 0.13 release is finally out and from testing in RHEL-6
we know that its JSON and netdev features are now good enough
for us to use by default.

* src/qemu/qemu_conf.c: Enable JSON + netdev for QEMU >= 0.13
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 5907bf3286..67195784da 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1225,9 +1225,6 @@ static unsigned long long qemudComputeCmdFlags(const char *help,
     if (strstr(help, "-fsdev"))
         flags |= QEMUD_CMD_FLAG_FSDEV;
 
-    /* Keep disabled till we're actually ready to turn on netdev mode
-     * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */
-#if 0
     if (strstr(help, "-netdev")) {
         /* Disable -netdev on 0.12 since although it exists,
          * the corresponding netdev_add/remove monitor commands
@@ -1235,7 +1232,7 @@ static unsigned long long qemudComputeCmdFlags(const char *help,
         if (version >= 13000)
             flags |= QEMUD_CMD_FLAG_NETDEV;
     }
-#endif
+
     if (strstr(help, "-sdl"))
         flags |= QEMUD_CMD_FLAG_SDL;
     if (strstr(help, "cores=") &&
@@ -1279,12 +1276,14 @@ static unsigned long long qemudComputeCmdFlags(const char *help,
     if (version >= 10000)
         flags |= QEMUD_CMD_FLAG_0_10;
 
-    /* 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)
+    /* While JSON mode was available in 0.12.0, it was too
+     * incomplete to contemplate using. The 0.13.0 release
+     * is good enough to use, even though it lacks one or
+     * two features. The benefits of JSON mode now outweigh
+     * the downside.
+     */
+     if (version >= 13000)
         flags |= QEMUD_CMD_FLAG_MONITOR_JSON;
-#endif
 
     return flags;
 }