]> xenbits.xensource.com Git - libvirt.git/commitdiff
tests: qemuxml2argv: add testInfoSetArgs
authorCole Robinson <crobinso@redhat.com>
Wed, 13 Mar 2019 22:20:57 +0000 (18:20 -0400)
committerCole Robinson <crobinso@redhat.com>
Thu, 21 Mar 2019 16:43:01 +0000 (12:43 -0400)
For now it just fills in the qemuCaps list. We will expand it
in future patches

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
tests/qemuxml2argvtest.c

index 67c5c74ec5e99aeb96299f1338eb0a742018e4b4..a540e762fac9a90c037cd5754926c51b79466f55 100644 (file)
@@ -624,6 +624,19 @@ testCompareXMLToArgv(const void *data)
     return ret;
 }
 
+static int
+testInfoSetArgs(struct testInfo *info, ...)
+{
+    va_list argptr;
+    int ret = 0;
+
+    va_start(argptr, info);
+    virQEMUCapsSetVAList(info->qemuCaps, argptr);
+    va_end(argptr);
+
+    return ret;
+}
+
 # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX"
 
 static int
@@ -809,7 +822,8 @@ mymain(void)
         }; \
         if (testInitQEMUCaps(&info, gic) < 0) \
             return EXIT_FAILURE; \
-        virQEMUCapsSetList(info.qemuCaps, __VA_ARGS__, QEMU_CAPS_LAST); \
+        if (testInfoSetArgs(&info, __VA_ARGS__, QEMU_CAPS_LAST) < 0) \
+            return EXIT_FAILURE; \
         if (virTestRun("QEMU XML-2-ARGV " name, \
                        testCompareXMLToArgv, &info) < 0) \
             ret = -1; \