[libvirt] [PATCH 22/23] qemu_conf: rename checkdefaultTLSx509certdir

Ján Tomko jtomko at redhat.com
Tue Jan 15 13:23:18 UTC 2019


Use defaultTLSx509certdirPresent for consistencty.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_conf.c | 4 ++--
 src/qemu/qemu_conf.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 0877a5b7c1..0aa428b87f 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -431,7 +431,7 @@ virQEMUDriverConfigLoadDefaultTLSEntry(virQEMUDriverConfigPtr cfg,
 
     if ((rv = virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir)) < 0)
         return -1;
-    cfg->checkdefaultTLSx509certdir = (rv == 1);
+    cfg->defaultTLSx509certdirPresent = (rv == 1);
     if (virConfGetValueBool(conf, "default_tls_x509_verify", &cfg->defaultTLSx509verify) < 0)
         return -1;
     if (virConfGetValueString(conf, "default_tls_x509_secret_uuid",
@@ -1107,7 +1107,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
 int
 virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg)
 {
-    if (cfg->checkdefaultTLSx509certdir) {
+    if (cfg->defaultTLSx509certdirPresent) {
         if (!virFileExists(cfg->defaultTLSx509certdir)) {
             virReportError(VIR_ERR_CONF_SYNTAX,
                            _("default_tls_x509_cert_dir directory '%s' "
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 87e730058b..bce8364c5a 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -115,7 +115,7 @@ struct _virQEMUDriverConfig {
     char *swtpmStorageDir;
 
     char *defaultTLSx509certdir;
-    bool checkdefaultTLSx509certdir;
+    bool defaultTLSx509certdirPresent;
     bool defaultTLSx509verify;
     char *defaultTLSx509secretUUID;
 
-- 
2.20.1




More information about the libvir-list mailing list