]> xenbits.xensource.com Git - libvirt.git/commitdiff
virQEMUDriverConfigLoadSpecificTLSEntry: Move fetching of 'chardev_tls' above macro
authorPeter Krempa <pkrempa@redhat.com>
Tue, 30 Jun 2020 15:51:50 +0000 (17:51 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 7 Jul 2020 10:58:18 +0000 (12:58 +0200)
Move the extraction of the config value so that it makes more sense
after upcoming refactors.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
src/qemu/qemu_conf.c

index 33b3989268dbf7e3ce6102798176214c62470e88..2cbff1348a7a5f0cf8f79ee582ed3da6a75c9f1f 100644 (file)
@@ -483,6 +483,8 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverConfigPtr cfg,
         return -1;
     if (virConfGetValueString(conf, "nbd_tls_x509_cert_dir", &cfg->nbdTLSx509certdir) < 0)
         return -1;
+    if (virConfGetValueBool(conf, "chardev_tls", &cfg->chardevTLS) < 0)
+        return -1;
 
 #define GET_CONFIG_TLS_CERTINFO(val) \
     do { \
@@ -500,8 +502,6 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverConfigPtr cfg,
             return -1; \
     } while (0)
 
-    if (virConfGetValueBool(conf, "chardev_tls", &cfg->chardevTLS) < 0)
-        return -1;
     GET_CONFIG_TLS_CERTINFO(chardev);
 
     GET_CONFIG_TLS_CERTINFO(migrate);