From 1195e10b989f60cd5dc972472dec33157157c2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Tue, 15 Jan 2019 12:24:02 +0100 Subject: [PATCH] qemu_conf: split out virQEMUDriverConfigLoadSaveEntry 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 | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 00c3e5507e..61d6d619dc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -423,6 +423,27 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs, } +static int +virQEMUDriverConfigLoadSaveEntry(virQEMUDriverConfigPtr cfg, + virConfPtr conf) +{ + if (virConfGetValueString(conf, "save_image_format", &cfg->saveImageFormat) < 0) + return -1; + if (virConfGetValueString(conf, "dump_image_format", &cfg->dumpImageFormat) < 0) + return -1; + if (virConfGetValueString(conf, "snapshot_image_format", &cfg->snapshotImageFormat) < 0) + return -1; + if (virConfGetValueString(conf, "auto_dump_path", &cfg->autoDumpPath) < 0) + return -1; + if (virConfGetValueBool(conf, "auto_dump_bypass_cache", &cfg->autoDumpBypassCache) < 0) + return -1; + if (virConfGetValueBool(conf, "auto_start_bypass_cache", &cfg->autoStartBypassCache) < 0) + return -1; + + return 0; +} + + static int virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) @@ -969,19 +990,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; } - - if (virConfGetValueString(conf, "save_image_format", &cfg->saveImageFormat) < 0) - goto cleanup; - if (virConfGetValueString(conf, "dump_image_format", &cfg->dumpImageFormat) < 0) - goto cleanup; - if (virConfGetValueString(conf, "snapshot_image_format", &cfg->snapshotImageFormat) < 0) - goto cleanup; - - if (virConfGetValueString(conf, "auto_dump_path", &cfg->autoDumpPath) < 0) - goto cleanup; - if (virConfGetValueBool(conf, "auto_dump_bypass_cache", &cfg->autoDumpBypassCache) < 0) - goto cleanup; - if (virConfGetValueBool(conf, "auto_start_bypass_cache", &cfg->autoStartBypassCache) < 0) + if (virQEMUDriverConfigLoadSaveEntry(cfg, conf) < 0) goto cleanup; if (virQEMUDriverConfigLoadProcessEntry(cfg, conf) < 0)