[libvirt] [PATCH 2/2] qemu: Add support for the <nesting/> feature.

[Evan Broder]

---
 src/qemu/qemu_conf.c |    7 +++++++
 src/qemu/qemu_conf.h |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index e1e24c3..452cbe0 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -897,6 +897,8 @@ static unsigned int qemudComputeCmdFlags(const char *help,
         flags |= QEMUD_CMD_FLAG_MEM_PATH;
     if (strstr(help, "-chardev"))
         flags |= QEMUD_CMD_FLAG_CHARDEV;
+    if (strstr(help, "-enable-nesting"))
+        flags |= QEMUD_CMD_FLAG_NESTING;
 
     if (version >= 9000)
         flags |= QEMUD_CMD_FLAG_VNC_COLON;
@@ -1837,6 +1839,9 @@ int qemudBuildCommandLine(virConnectPtr conn,
             goto error;
         }
     }
+    if ((qemuCmdFlags & QEMUD_CMD_FLAG_NESTING) &&
+        (def->features & (1 << VIR_DOMAIN_FEATURE_NESTING)))
+        ADD_ARG_LIT("-enable-nesting");
 
     /*
      * NB, -nographic *MUST* come before any serial, or monitor
@@ -3474,6 +3479,8 @@ virDomainDefPtr qemuParseCommandLine(virConnectPtr conn,
             fullscreen = 1;
         } else if (STREQ(arg, "-localtime")) {
             def->localtime = 1;
+        } else if (STREQ(arg, "-enable-nesting")) {
+            def->features |= (1 << VIR_DOMAIN_FEATURE_NESTING);
         } else if (STREQ(arg, "-kernel")) {
             WANT_VALUE();
             if (!(def->os.kernel = strdup(val)))
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 5d433d3..1b2c1c7 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -73,6 +73,7 @@ enum qemud_cmd_flags {
     QEMUD_CMD_FLAG_XEN_DOMID     = (1 << 20), /* -xen-domid (new style xen integration) */
     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_NESTING       = (1 << 23), /* Is the -enable-nesting flag available */
 };
 
 /* Main driver state */
-- 
1.6.2.1