[libvirt] [PATCH 02/21] tests: qemuxml2argv: add testInfoSetArgs

Cole Robinson crobinso at redhat.com
Thu Mar 14 14:43:55 UTC 2019


For now it just fills in the qemuCaps list. We will expand it
in future patches

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 tests/qemuxml2argvtest.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 67c5c74ec5..3b90cd1873 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -624,6 +624,18 @@ testCompareXMLToArgv(const void *data)
     return ret;
 }
 
+static int
+testInfoSetArgs(struct testInfo *info, ...)
+{
+    va_list argptr;
+    int ret = 0;
+
+    va_start(argptr, info);
+    virQEMUCapsSetVList(info->qemuCaps, argptr);
+    va_end(argptr);
+    return ret;
+}
+
 # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX"
 
 static int
@@ -809,7 +821,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; \
-- 
2.20.1




More information about the libvir-list mailing list