From 6427aca725d97ec5b8fe6085aa62b7aca8534483 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Tue, 15 Jan 2019 10:10:36 +0100 Subject: [PATCH] qemu_conf: split out virQEMUDriverConfigLoadMemoryEntry MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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) -- 2.39.5