From cfe99a336dcabfa7e9999d5b72447ef9ca768d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 14 Jan 2019 22:15:40 +0100 Subject: [PATCH] qemu_conf: split out virQEMUDriverConfigLoadVNCEntry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Split out parts of the config parsing code to make the parent function easier to read. Signed-off-by: Ján Tomko Reviewed-by: John Ferlan --- src/qemu/qemu_conf.c | 51 +++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4d378d633f..d7ba2aa1e8 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -423,6 +423,37 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs, } +static int +virQEMUDriverConfigLoadVNCEntry(virQEMUDriverConfigPtr cfg, + virConfPtr conf) +{ + int rv; + + if (virConfGetValueBool(conf, "vnc_auto_unix_socket", &cfg->vncAutoUnixSocket) < 0) + return -1; + if (virConfGetValueBool(conf, "vnc_tls", &cfg->vncTLS) < 0) + return -1; + if ((rv = virConfGetValueBool(conf, "vnc_tls_x509_verify", &cfg->vncTLSx509verify)) < 0) + return -1; + if (rv == 1) + cfg->vncTLSx509verifyPresent = true; + if (virConfGetValueString(conf, "vnc_tls_x509_cert_dir", &cfg->vncTLSx509certdir) < 0) + return -1; + if (virConfGetValueString(conf, "vnc_listen", &cfg->vncListen) < 0) + return -1; + if (virConfGetValueString(conf, "vnc_password", &cfg->vncPassword) < 0) + return -1; + if (virConfGetValueBool(conf, "vnc_sasl", &cfg->vncSASL) < 0) + return -1; + if (virConfGetValueString(conf, "vnc_sasl_dir", &cfg->vncSASLdir) < 0) + return -1; + if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) + return -1; + + return 0; +} + + static int virQEMUDriverConfigLoadNographicsEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) @@ -1001,25 +1032,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, &cfg->defaultTLSx509secretUUID) < 0) goto cleanup; - if (virConfGetValueBool(conf, "vnc_auto_unix_socket", &cfg->vncAutoUnixSocket) < 0) - goto cleanup; - if (virConfGetValueBool(conf, "vnc_tls", &cfg->vncTLS) < 0) - goto cleanup; - if ((rv = virConfGetValueBool(conf, "vnc_tls_x509_verify", &cfg->vncTLSx509verify)) < 0) - goto cleanup; - if (rv == 1) - cfg->vncTLSx509verifyPresent = true; - if (virConfGetValueString(conf, "vnc_tls_x509_cert_dir", &cfg->vncTLSx509certdir) < 0) - goto cleanup; - if (virConfGetValueString(conf, "vnc_listen", &cfg->vncListen) < 0) - goto cleanup; - if (virConfGetValueString(conf, "vnc_password", &cfg->vncPassword) < 0) - goto cleanup; - if (virConfGetValueBool(conf, "vnc_sasl", &cfg->vncSASL) < 0) - goto cleanup; - if (virConfGetValueString(conf, "vnc_sasl_dir", &cfg->vncSASLdir) < 0) - goto cleanup; - if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) + if (virQEMUDriverConfigLoadVNCEntry(cfg, conf) < 0) goto cleanup; if (virQEMUDriverConfigLoadNographicsEntry(cfg, conf) < 0)