From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 15 Jan 2019 09:10:36 +0000 (+0100)
Subject: qemu_conf: split out virQEMUDriverConfigLoadMemoryEntry
X-Git-Tag: v5.1.0-rc1~438
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6427aca725d97ec5b8fe6085aa62b7aca8534483;p=thirdparty%2Flibvirt.git

qemu_conf: split out virQEMUDriverConfigLoadMemoryEntry

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 da78690667..00b7388328 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -423,6 +423,14 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs,
 }
 
 
+static int
+virQEMUDriverConfigLoadMemoryEntry(virQEMUDriverConfigPtr cfg,
+                                   virConfPtr conf)
+{
+    return virConfGetValueString(conf, "memory_backing_dir", &cfg->memoryBackingDir);
+}
+
+
 static int
 virQEMUDriverConfigLoadSWTPMEntry(virQEMUDriverConfigPtr cfg,
                                   virConfPtr conf)
@@ -892,7 +900,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
         }
     }
 
-    if (virConfGetValueString(conf, "memory_backing_dir", &cfg->memoryBackingDir) < 0)
+    if (virQEMUDriverConfigLoadMemoryEntry(cfg, conf) < 0)
         goto cleanup;
 
     if (virQEMUDriverConfigLoadSWTPMEntry(cfg, conf) < 0)