]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
tests: Drop no longer necessary overrides
authorAndrea Bolognani <abologna@redhat.com>
Thu, 2 Mar 2023 17:11:35 +0000 (18:11 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 6 Mar 2023 13:35:35 +0000 (14:35 +0100)
Creating a privileged config ensures these are already set
correctly.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
tests/qemuxml2argvtest.c
tests/qemuxml2xmltest.c

index 289fcf8014896076b5b4b65f83f868dab7aca283..4393578d1e7256d20a2cc34a1416877c32ce333d 100644 (file)
@@ -830,8 +830,6 @@ mymain(void)
     linuxCaps = driver.caps;
     macOSCaps = testQemuCapsInitMacOS();
 
-    VIR_FREE(driver.config->defaultTLSx509certdir);
-    driver.config->defaultTLSx509certdir = g_strdup("/etc/pki/qemu");
     VIR_FREE(driver.config->vncTLSx509certdir);
     driver.config->vncTLSx509certdir = g_strdup("/etc/pki/libvirt-vnc");
     VIR_FREE(driver.config->spiceTLSx509certdir);
@@ -857,10 +855,6 @@ mymain(void)
     driver.config->hugetlbfs[0].deflt = true;
     driver.config->hugetlbfs[1].size = 1048576;
     driver.config->spicePassword = g_strdup("123456");
-    VIR_FREE(driver.config->memoryBackingDir);
-    driver.config->memoryBackingDir = g_strdup("/var/lib/libvirt/qemu/ram");
-    VIR_FREE(driver.config->nvramDir);
-    driver.config->nvramDir = g_strdup("/var/lib/libvirt/qemu/nvram");
 
     virFileWrapperAddPrefix(SYSCONFDIR "/qemu/firmware",
                             abs_srcdir "/qemufirmwaredata/etc/qemu/firmware");
index 847ebe85c688b86d0e9094a04100394e18b2e102..a7e29001cf86caabd2fbf3a2e76bff981eaa57d5 100644 (file)
@@ -149,9 +149,6 @@ mymain(void)
 
     cfg = virQEMUDriverGetConfig(&driver);
 
-    VIR_FREE(cfg->nvramDir);
-    cfg->nvramDir = g_strdup("/var/lib/libvirt/qemu/nvram");
-
     if (!(conn = virGetConnect()))
         goto cleanup;