From 53680aa37952c46b86050d7c4f844e6111e8cade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Tue, 15 Jan 2019 10:23:06 +0100 Subject: [PATCH] qemu_conf: split out virQEMUDriverConfigLoadNographicsEntry 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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0b69938e28..4d378d633f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -423,6 +423,14 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs, } +static int +virQEMUDriverConfigLoadNographicsEntry(virQEMUDriverConfigPtr cfg, + virConfPtr conf) +{ + return virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio); +} + + static int virQEMUDriverConfigLoadSPICEEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) @@ -1013,7 +1021,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) goto cleanup; - if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0) + + if (virQEMUDriverConfigLoadNographicsEntry(cfg, conf) < 0) goto cleanup; if (virQEMUDriverConfigLoadSPICEEntry(cfg, conf) < 0) -- GitLab