mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-03 11:35:19 +00:00
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>
This commit is contained in:
parent
6870e1f141
commit
a4d222644e
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user