From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 30 Jun 2020 15:51:50 +0000 (+0200)
Subject: virQEMUDriverConfigLoadSpecificTLSEntry: Move fetching of 'chardev_tls' above macro
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=94b5e9ebf62be0292cda9b3c31f2be1e385316cb;p=libvirt.git

virQEMUDriverConfigLoadSpecificTLSEntry: Move fetching of 'chardev_tls' above macro

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>
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 33b3989268..2cbff1348a 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -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);