From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 15 Jan 2019 11:33:07 +0000 (+0100)
Subject: qemu_conf: split out virQEMUDriverConfigLoadRPCEntry
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e79e0cacc5045291ecf48b84db15c584ca250e7a;p=libvirt.git

qemu_conf: split out virQEMUDriverConfigLoadRPCEntry

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 5c2fddf283..7765140fb9 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -423,6 +423,21 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs,
 }
 
 
+static int
+virQEMUDriverConfigLoadRPCEntry(virQEMUDriverConfigPtr cfg,
+                                virConfPtr conf)
+{
+    if (virConfGetValueUInt(conf, "max_queued", &cfg->maxQueuedJobs) < 0)
+        return -1;
+    if (virConfGetValueInt(conf, "keepalive_interval", &cfg->keepAliveInterval) < 0)
+        return -1;
+    if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 static int
 virQEMUDriverConfigLoadNetworkEntry(virQEMUDriverConfigPtr cfg,
                                     virConfPtr conf,
@@ -946,12 +961,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
         VIR_FREE(stdioHandler);
     }
 
-    if (virConfGetValueUInt(conf, "max_queued", &cfg->maxQueuedJobs) < 0)
-        goto cleanup;
-
-    if (virConfGetValueInt(conf, "keepalive_interval", &cfg->keepAliveInterval) < 0)
-        goto cleanup;
-    if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0)
+    if (virQEMUDriverConfigLoadRPCEntry(cfg, conf) < 0)
         goto cleanup;
 
     if (virQEMUDriverConfigLoadNetworkEntry(cfg, conf, filename) < 0)