From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 14 Jan 2019 21:24:17 +0000 (+0100)
Subject: qemu_conf: split out virQEMUDriverConfigLoadDefaultTLSEntry
X-Git-Tag: v5.1.0-rc1~423
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4079f4767774a77e611eaefe1918fcad931945d0;p=thirdparty%2Flibvirt.git

qemu_conf: split out virQEMUDriverConfigLoadDefaultTLSEntry

Split out parts of the config parsing code to make
the parent function easier to read.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index d7ba2aa1e8..49c5a76771 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -423,6 +423,25 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs,
 }
 
 
+static int
+virQEMUDriverConfigLoadDefaultTLSEntry(virQEMUDriverConfigPtr cfg,
+                                       virConfPtr conf)
+{
+    int rv;
+
+    if ((rv = virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir)) < 0)
+        return -1;
+    cfg->checkdefaultTLSx509certdir = (rv == 1);
+    if (virConfGetValueBool(conf, "default_tls_x509_verify", &cfg->defaultTLSx509verify) < 0)
+        return -1;
+    if (virConfGetValueString(conf, "default_tls_x509_secret_uuid",
+                              &cfg->defaultTLSx509secretUUID) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 static int
 virQEMUDriverConfigLoadVNCEntry(virQEMUDriverConfigPtr cfg,
                                 virConfPtr conf)
@@ -1009,7 +1028,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
 {
     virConfPtr conf = NULL;
     int ret = -1;
-    int rv;
     char *corestr = NULL;
 
     /* Just check the file is readable before opening it, otherwise
@@ -1023,13 +1041,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
     if (!(conf = virConfReadFile(filename, 0)))
         goto cleanup;
 
-    if ((rv = virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir)) < 0)
-        goto cleanup;
-    cfg->checkdefaultTLSx509certdir = (rv == 1);
-    if (virConfGetValueBool(conf, "default_tls_x509_verify", &cfg->defaultTLSx509verify) < 0)
-        goto cleanup;
-    if (virConfGetValueString(conf, "default_tls_x509_secret_uuid",
-                              &cfg->defaultTLSx509secretUUID) < 0)
+    if (virQEMUDriverConfigLoadDefaultTLSEntry(cfg, conf) < 0)
         goto cleanup;
 
     if (virQEMUDriverConfigLoadVNCEntry(cfg, conf) < 0)