From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 8 Mar 2023 12:18:57 +0000 (+0100)
Subject: domaincapstest: Make construction of filename more extensible
X-Git-Tag: v9.3.0-rc1~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4d222644e3bf4611fe2b4b4222e6e09090aa4de;p=thirdparty%2Flibvirt.git

domaincapstest: Make construction of filename more extensible

Rather than trying to cram everything into one printf statement format
the type with prefix and machine with prefix separately and then
concatenate everything into the filename.

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

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 359ead2d32..2120e7efd5 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -252,13 +252,31 @@ doTestQemuInternal(const char *version,
     g_autofree char *name = NULL;
     g_autofree char *capsName = NULL;
     g_autofree char *emulator = NULL;
+    const char *typestr = NULL;
+    g_autofree char *mach = NULL;
     int rc;
 
-    name = g_strdup_printf("qemu_%s%s%s%s.%s",
-                           version,
-                           (type == VIR_DOMAIN_VIRT_QEMU ? "-tcg" : ""),
-                           (machine ? "-" : ""), (machine ? machine : ""),
-                           arch);
+    switch ((unsigned int) type) {
+    case VIR_DOMAIN_VIRT_QEMU:
+        typestr = "-tcg";
+        break;
+
+    case VIR_DOMAIN_VIRT_KVM:
+        typestr = "";
+        break;
+
+    default:
+        abort();
+        break;
+    }
+
+    if (machine)
+        mach = g_strdup_printf("-%s", machine);
+    else
+        mach = g_strdup("");
+
+    name = g_strdup_printf("qemu_%s%s%s.%s",
+                           version, typestr, mach, arch);
     capsName = g_strdup_printf("caps_%s", version);
     emulator = g_strdup_printf("/usr/bin/qemu-system-%s", arch);