From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 16 Aug 2021 13:57:08 +0000 (+0200)
Subject: qemuxml2argvtest: Add 'ARG_END' from higher level macros
X-Git-Tag: v7.7.0-rc1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36a41cad9db54c862cb13d80e4fa03eef4879f4f;p=thirdparty%2Flibvirt.git

qemuxml2argvtest: Add 'ARG_END' from higher level macros

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 53c4df403a..c99bb18f7f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -943,7 +943,7 @@ mymain(void)
         }; \
         info.qapiSchemaCache = qapiSchemaCache; \
         if (testQemuInfoSetArgs(&info, capscache, capslatest, \
-                                __VA_ARGS__, ARG_END) < 0) \
+                                __VA_ARGS__) < 0) \
             ret = -1; \
         testInfoSetPaths(&info, _suffix); \
         if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \
@@ -956,7 +956,8 @@ mymain(void)
     DO_TEST_INTERNAL(name, "." arch "-" ver, \
                      ARG_CAPS_ARCH, arch, \
                      ARG_CAPS_VER, ver, \
-                     __VA_ARGS__)
+                     __VA_ARGS__, \
+                     ARG_END)
 
 # define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \
     DO_TEST_CAPS_INTERNAL(name, arch, "latest", __VA_ARGS__)
@@ -1009,7 +1010,7 @@ mymain(void)
 
 # define DO_TEST_FULL(name, ...) \
     DO_TEST_INTERNAL(name, "", \
-                     __VA_ARGS__, QEMU_CAPS_LAST)
+                     __VA_ARGS__, QEMU_CAPS_LAST, ARG_END)
 
 /* All the following macros require an explicit QEMU_CAPS_* list
  * at the end of the argument list, or the NONE placeholder.