2:49 a.m.
From: Peter Krempa <pkrempa(a)redhat.com>
Remove the config file handling for the config options we no longer use.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_conf.c | 17 -----------------
src/qemu/qemu_conf.h | 4 ----
tests/qemuxmlconftest.c | 4 ----
tests/testutilsqemu.c | 2 --
4 files changed, 27 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 8ffbcacaf2..9bf12fc179 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -385,9 +385,6 @@ static void virQEMUDriverConfigDispose(void *obj)
g_free(cfg->chardevTLSx509certdir);
g_free(cfg->chardevTLSx509secretUUID);
- g_free(cfg->vxhsTLSx509certdir);
- g_free(cfg->vxhsTLSx509secretUUID);
-
g_free(cfg->nbdTLSx509certdir);
g_free(cfg->nbdTLSx509secretUUID);
@@ -553,8 +550,6 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverConfig *cfg,
{
int rv;
- if (virConfGetValueBool(conf, "vxhs_tls", &cfg->vxhsTLS) < 0)
- return -1;
if (virConfGetValueBool(conf, "nbd_tls", &cfg->nbdTLS) < 0)
return -1;
if (virConfGetValueBool(conf, "chardev_tls", &cfg->chardevTLS) <
0)
@@ -591,8 +586,6 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverConfig *cfg,
GET_CONFIG_TLS_CERTINFO_COMMON(backup);
GET_CONFIG_TLS_CERTINFO_SERVER(backup);
- GET_CONFIG_TLS_CERTINFO_COMMON(vxhs);
-
GET_CONFIG_TLS_CERTINFO_COMMON(nbd);
#undef GET_CONFIG_TLS_CERTINFO_COMMON
@@ -1416,14 +1409,6 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg)
return -1;
}
- if (cfg->vxhsTLSx509certdir &&
- !virFileExists(cfg->vxhsTLSx509certdir)) {
- virReportError(VIR_ERR_CONF_SYNTAX,
- _("vxhs_tls_x509_cert_dir directory '%1$s' does not
exist"),
- cfg->vxhsTLSx509certdir);
- return -1;
- }
-
if (cfg->nbdTLSx509certdir &&
!virFileExists(cfg->nbdTLSx509certdir)) {
virReportError(VIR_ERR_CONF_SYNTAX,
@@ -1452,7 +1437,6 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfig *cfg)
SET_TLS_SECRET_UUID_DEFAULT(chardev);
SET_TLS_SECRET_UUID_DEFAULT(migrate);
SET_TLS_SECRET_UUID_DEFAULT(backup);
- SET_TLS_SECRET_UUID_DEFAULT(vxhs);
SET_TLS_SECRET_UUID_DEFAULT(nbd);
#undef SET_TLS_SECRET_UUID_DEFAULT
@@ -1481,7 +1465,6 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfig *cfg)
SET_TLS_X509_CERT_DEFAULT(chardev);
SET_TLS_X509_CERT_DEFAULT(migrate);
SET_TLS_X509_CERT_DEFAULT(backup);
- SET_TLS_X509_CERT_DEFAULT(vxhs);
SET_TLS_X509_CERT_DEFAULT(nbd);
#undef SET_TLS_X509_CERT_DEFAULT
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index f6b13c828d..1ce9dbe4a8 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -159,10 +159,6 @@ struct _virQEMUDriverConfig {
bool backupTLSx509verifyPresent;
char *backupTLSx509secretUUID;
- bool vxhsTLS;
- char *vxhsTLSx509certdir;
- char *vxhsTLSx509secretUUID;
-
bool nbdTLS;
char *nbdTLSx509certdir;
char *nbdTLSx509secretUUID;
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 9a29262d1b..0f1c935267 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1593,16 +1593,12 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-network-source-auth");
DO_TEST_CAPS_LATEST("disk-network-source-curl");
DO_TEST_CAPS_LATEST("disk-network-nfs");
- driver.config->vxhsTLS = 1;
driver.config->nbdTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
- driver.config->vxhsTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname",
"6.2.0");
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
DO_TEST_CAPS_LATEST("disk-network-http");
VIR_FREE(driver.config->nbdTLSx509secretUUID);
- VIR_FREE(driver.config->vxhsTLSx509secretUUID);
- driver.config->vxhsTLS = 0;
DO_TEST_CAPS_LATEST("disk-network-ssh");
DO_TEST_CAPS_LATEST("disk-no-boot");
DO_TEST_CAPS_LATEST("disk-nvme");
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 9038a37869..78ec521266 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -396,8 +396,6 @@ int qemuTestDriverInit(virQEMUDriver *driver)
cfg->rdpTLSx509certdir = g_strdup("/etc/pki/libvirt-rdp");
VIR_FREE(cfg->chardevTLSx509certdir);
cfg->chardevTLSx509certdir = g_strdup("/etc/pki/libvirt-chardev");
- VIR_FREE(cfg->vxhsTLSx509certdir);
- cfg->vxhsTLSx509certdir = g_strdup("/etc/pki/libvirt-vxhs");
VIR_FREE(cfg->nbdTLSx509certdir);
cfg->nbdTLSx509certdir = g_strdup("/etc/pki/libvirt-nbd");
VIR_FREE(cfg->migrateTLSx509certdir);
--
2.49.0