From 00063c2c9542c691d16541ecc72f620ed9de1589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Tue, 15 Jan 2019 12:33:26 +0100
Subject: [PATCH] qemu_conf: split out virQEMUDriverConfigLoadDeviceEntry
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 <jtomko@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_conf.c | 46 ++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 7765140fb9..714b8ae1e6 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -423,6 +423,32 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs,
 }
 
 
+static int
+virQEMUDriverConfigLoadDeviceEntry(virQEMUDriverConfigPtr cfg,
+                                   virConfPtr conf)
+{
+    bool tmp;
+    int rv;
+
+    if (virConfGetValueBool(conf, "mac_filter", &cfg->macFilter) < 0)
+        return -1;
+
+    if (virConfGetValueBool(conf, "relaxed_acs_check", &cfg->relaxedACS) < 0)
+        return -1;
+    if (virConfGetValueString(conf, "lock_manager", &cfg->lockManagerName) < 0)
+        return -1;
+    if ((rv = virConfGetValueBool(conf, "allow_disk_format_probing", &tmp)) < 0)
+        return -1;
+    if (rv == 1 && tmp) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("allow_disk_format_probing is no longer supported"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
 static int
 virQEMUDriverConfigLoadRPCEntry(virQEMUDriverConfigPtr cfg,
                                 virConfPtr conf)
@@ -702,7 +728,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
     char *stdioHandler = NULL;
     char **hugetlbfs = NULL;
     char *corestr = NULL;
-    bool tmp;
 
     /* Just check the file is readable before opening it, otherwise
      * libvirt emits an error.
@@ -901,21 +926,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
     if (virConfGetValueString(conf, "pr_helper", &cfg->prHelperName) < 0)
         goto cleanup;
 
-    if (virConfGetValueBool(conf, "mac_filter", &cfg->macFilter) < 0)
-        goto cleanup;
-
-    if (virConfGetValueBool(conf, "relaxed_acs_check", &cfg->relaxedACS) < 0)
-        goto cleanup;
     if (virConfGetValueBool(conf, "clear_emulator_capabilities", &cfg->clearEmulatorCapabilities) < 0)
         goto cleanup;
-
-    if ((rv = virConfGetValueBool(conf, "allow_disk_format_probing", &tmp)) < 0)
-        goto cleanup;
-    if (rv == 1 && tmp) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("allow_disk_format_probing is no longer supported"));
-        goto cleanup;
-    }
     if (virConfGetValueBool(conf, "set_process_name", &cfg->setProcessName) < 0)
         goto cleanup;
     if (virConfGetValueUInt(conf, "max_processes", &cfg->maxProcesses) < 0)
@@ -941,9 +953,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
     if (virConfGetValueBool(conf, "dump_guest_core", &cfg->dumpGuestCore) < 0)
         goto cleanup;
 
-    if (virConfGetValueString(conf, "lock_manager", &cfg->lockManagerName) < 0)
-        goto cleanup;
-
     if (virConfGetValueString(conf, "stdio_handler", &stdioHandler) < 0)
         goto cleanup;
     if (stdioHandler) {
@@ -961,6 +970,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
         VIR_FREE(stdioHandler);
     }
 
+    if (virQEMUDriverConfigLoadDeviceEntry(cfg, conf) < 0)
+        goto cleanup;
+
     if (virQEMUDriverConfigLoadRPCEntry(cfg, conf) < 0)
         goto cleanup;