[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v2 6/7] Support for faking emulator in qemuxml2argv tests



This patch allows for using custom scripts instead of /usr/bin/qemu
emulator in domain XML. To do so, one would specify relative path to the
custom script in <emulator/>. The path needs to be relative to
qemuxml2argvdata directory and it will be transparently made absolute in
runtime. The expected command line needs to contain the exact relative
path as was used in domain XML.

The problem is RelaxNG schema for domain XML only allows for absolute
path be used within <emulator/>. To workaround it, an extra '/' must be
add at the beginning of the path. That is, instead of "./qemu.sh" or
"../emulator/qemu.sh" one would use "/./qemu.sh" or
"/../emulator/qemu.sh". The extra slash is removed before further
processing. I don't like this workaround, it's very ugly but it's the
best option I was able to come up with. Relaxing domain XML schema is
not an option IMO.
---
 tests/qemuxml2argvtest.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 9e4d5bf..a9b7404 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -38,6 +38,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
     virDomainDefPtr vmdef = NULL;
     virDomainChrDef monitor_chr;
     virConnectPtr conn;
+    char *emulator = NULL;
 
     if (!(conn = virGetConnect()))
         goto fail;
@@ -49,6 +50,16 @@ static int testCompareXMLToArgvFiles(const char *xml,
                                         VIR_DOMAIN_XML_INACTIVE)))
         goto fail;
 
+    if (vmdef->emulator && STRPREFIX(vmdef->emulator, "/.")) {
+        if (!(emulator = strdup(vmdef->emulator + 1)))
+            goto fail;
+        free(vmdef->emulator);
+        vmdef->emulator = NULL;
+        if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s",
+                        abs_srcdir, emulator) < 0)
+            goto fail;
+    }
+
     if (extraFlags & QEMUD_CMD_FLAG_DOMID)
         vmdef->id = 6;
     else
@@ -86,6 +97,12 @@ static int testCompareXMLToArgvFiles(const char *xml,
                               NULL, NULL, migrateFrom, NULL) < 0)
         goto fail;
 
+    if (emulator && *argv) {
+        free(*(char**) argv);
+        *argv = emulator;
+        emulator = NULL;
+    }
+
     len = 1; /* for trailing newline */
     tmp = qenv;
     while (*tmp) {
@@ -125,6 +142,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
     ret = 0;
 
  fail:
+    free(emulator);
     free(actualargv);
     if (argv) {
         tmp = argv;
-- 
1.7.0.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]