From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 2 Mar 2023 17:11:35 +0000 (+0100)
Subject: tests: Drop no longer necessary overrides
X-Git-Tag: v9.2.0-rc1~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f49b6cc6b818575633730711bbe09b886741b78;p=thirdparty%2Flibvirt.git

tests: Drop no longer necessary overrides

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>
---

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 289fcf8014..4393578d1e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -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");
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 847ebe85c6..a7e29001cf 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -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;