From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 15 Jan 2019 09:23:06 +0000 (+0100)
Subject: qemu_conf: split out virQEMUDriverConfigLoadNographicsEntry
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=53680aa37952c46b86050d7c4f844e6111e8cade;p=libvirt.git

qemu_conf: split out virQEMUDriverConfigLoadNographicsEntry

Split out parts of the config parsing code to make
the parent function easier to read.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

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)