]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu_conf: split out virQEMUDriverConfigLoadNographicsEntry
authorJán Tomko <jtomko@redhat.com>
Tue, 15 Jan 2019 09:23:06 +0000 (10:23 +0100)
committerJán Tomko <jtomko@redhat.com>
Fri, 18 Jan 2019 11:55:07 +0000 (12:55 +0100)
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>
src/qemu/qemu_conf.c

index 0b69938e285775b66168bf80a0680572a7345016..4d378d633fb7fa70d9f69408010d7e3965cea3dc 100644 (file)
@@ -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)