From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Fri, 9 Apr 2021 20:30:01 +0000 (-0500)
Subject: tests: nodedev: remove virt type from test macros
X-Git-Tag: v7.3.0-rc1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbfbceb0ff0c49a59cb60da941d147034f10418;p=thirdparty%2Flibvirt.git

tests: nodedev: remove virt type from test macros

We only use the virt_type "QEMU" in this tests, so simply hard-code it
in the test function rather than specifying it in the test macro.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c
index 6009ba7398..4c316e3ed0 100644
--- a/tests/nodedevmdevctltest.c
+++ b/tests/nodedevmdevctltest.c
@@ -10,8 +10,9 @@
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 
+#define VIRT_TYPE "QEMU"
+
 struct TestInfo {
-    const char *virt_type;
     const char *filename;
     virMdevctlCommand command;
 };
@@ -35,8 +36,7 @@ typedef virCommand * (*MdevctlCmdFunc)(virNodeDeviceDef *, char **, char **);
 
 
 static int
-testMdevctlCmd(const char *virt_type,
-               virMdevctlCommand cmd_type,
+testMdevctlCmd(virMdevctlCommand cmd_type,
                const char *mdevxml,
                const char *cmdfile,
                const char *jsonfile)
@@ -68,7 +68,7 @@ testMdevctlCmd(const char *virt_type,
             goto cleanup;
     }
 
-    if (!(def = virNodeDeviceDefParseFile(mdevxml, create, virt_type)))
+    if (!(def = virNodeDeviceDefParseFile(mdevxml, create, VIRT_TYPE)))
         goto cleanup;
 
     /* this function will set a stdin buffer containing the json configuration
@@ -120,8 +120,7 @@ testMdevctlHelper(const void *data)
     jsonfile = g_strdup_printf("%s/nodedevmdevctldata/%s-%s.json", abs_srcdir,
                                info->filename, cmd);
 
-    return testMdevctlCmd(info->virt_type, info->command, mdevxml,
-                          cmdlinefile, jsonfile);
+    return testMdevctlCmd(info->command, mdevxml, cmdlinefile, jsonfile);
 }
 
 
@@ -330,27 +329,27 @@ mymain(void)
     if (virTestRun(desc, func, info) < 0) \
         ret = -1;
 
-#define DO_TEST_CMD(desc, virt_type, filename, command) \
+#define DO_TEST_CMD(desc, filename, command) \
     do { \
-        struct TestInfo info = { virt_type, filename, command }; \
+        struct TestInfo info = { filename, command }; \
         DO_TEST_FULL(desc, testMdevctlHelper, &info); \
        } \
     while (0)
 
 #define DO_TEST_CREATE(filename) \
-    DO_TEST_CMD("create mdev " filename, "QEMU", filename, MDEVCTL_CMD_CREATE)
+    DO_TEST_CMD("create mdev " filename, filename, MDEVCTL_CMD_CREATE)
 
 #define DO_TEST_DEFINE(filename) \
-    DO_TEST_CMD("define mdev " filename, "QEMU", filename, MDEVCTL_CMD_DEFINE)
+    DO_TEST_CMD("define mdev " filename, filename, MDEVCTL_CMD_DEFINE)
 
 #define DO_TEST_STOP(filename) \
-    DO_TEST_CMD("stop mdev " filename, "QEMU", filename, MDEVCTL_CMD_STOP)
+    DO_TEST_CMD("stop mdev " filename, filename, MDEVCTL_CMD_STOP)
 
 #define DO_TEST_UNDEFINE(filename) \
-    DO_TEST_CMD("undefine mdev" filename, "QEMU", filename, MDEVCTL_CMD_UNDEFINE)
+    DO_TEST_CMD("undefine mdev" filename, filename, MDEVCTL_CMD_UNDEFINE)
 
 #define DO_TEST_START(filename) \
-    DO_TEST_CMD("start mdev " filename, "QEMU", filename, MDEVCTL_CMD_START)
+    DO_TEST_CMD("start mdev " filename, filename, MDEVCTL_CMD_START)
 
 #define DO_TEST_LIST_DEFINED() \
     DO_TEST_FULL("list defined mdevs", testMdevctlListDefined, NULL)