提交 e6df8632 编写于 作者: J Ján Tomko

qemu_conf: rename checkdefaultTLSx509certdir

Use defaultTLSx509certdirPresent for consistencty.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 4079f476
...@@ -431,7 +431,7 @@ virQEMUDriverConfigLoadDefaultTLSEntry(virQEMUDriverConfigPtr cfg, ...@@ -431,7 +431,7 @@ virQEMUDriverConfigLoadDefaultTLSEntry(virQEMUDriverConfigPtr cfg,
if ((rv = virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir)) < 0) if ((rv = virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir)) < 0)
return -1; return -1;
cfg->checkdefaultTLSx509certdir = (rv == 1); cfg->defaultTLSx509certdirPresent = (rv == 1);
if (virConfGetValueBool(conf, "default_tls_x509_verify", &cfg->defaultTLSx509verify) < 0) if (virConfGetValueBool(conf, "default_tls_x509_verify", &cfg->defaultTLSx509verify) < 0)
return -1; return -1;
if (virConfGetValueString(conf, "default_tls_x509_secret_uuid", if (virConfGetValueString(conf, "default_tls_x509_secret_uuid",
...@@ -1111,7 +1111,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, ...@@ -1111,7 +1111,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
int int
virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg)
{ {
if (cfg->checkdefaultTLSx509certdir) { if (cfg->defaultTLSx509certdirPresent) {
if (!virFileExists(cfg->defaultTLSx509certdir)) { if (!virFileExists(cfg->defaultTLSx509certdir)) {
virReportError(VIR_ERR_CONF_SYNTAX, virReportError(VIR_ERR_CONF_SYNTAX,
_("default_tls_x509_cert_dir directory '%s' " _("default_tls_x509_cert_dir directory '%s' "
......
...@@ -115,7 +115,7 @@ struct _virQEMUDriverConfig { ...@@ -115,7 +115,7 @@ struct _virQEMUDriverConfig {
char *swtpmStorageDir; char *swtpmStorageDir;
char *defaultTLSx509certdir; char *defaultTLSx509certdir;
bool checkdefaultTLSx509certdir; bool defaultTLSx509certdirPresent;
bool defaultTLSx509verify; bool defaultTLSx509verify;
char *defaultTLSx509secretUUID; char *defaultTLSx509secretUUID;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册