On 1/15/19 8:23 AM, Ján Tomko wrote: > Split out parts of the config parsing code to make > the parent function easier to read. > > Signed-off-by: Ján Tomko <[email protected]> > --- > src/qemu/qemu_conf.c | 50 +++++++++++++++++++++++++++----------------- > 1 file changed, 31 insertions(+), 19 deletions(-) > > diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c > index 62c49c600c..7eecb3ef91 100644 > --- a/src/qemu/qemu_conf.c > +++ b/src/qemu/qemu_conf.c > @@ -423,6 +423,36 @@ 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; > +} > +
blank line Reviewed-by: John Ferlan <[email protected]> John [...] -- libvir-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/libvir-list
