[PATCH v2 11/31] qemu: Introduce virQEMUCapsLoadCPUModels

[Jiri Denemark <jdenemar@xxxxxxxxxx>]

This patch moves the CPU models parsing code from virQEMUCapsLoadCache
into a separate function.

Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c | 70 +++++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 913a22a..7abdc2b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3002,6 +3002,52 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
 }
 
 
+static int
+virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps,
+                         xmlXPathContextPtr ctxt)
+{
+    xmlNodePtr *nodes = NULL;
+    char *str = NULL;
+    size_t i;
+    int n;
+    int ret = -1;
+
+    if ((n = virXPathNodeSet("./cpu", ctxt, &nodes)) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("failed to parse qemu capabilities cpus"));
+        goto cleanup;
+    }
+
+    if (n == 0) {
+        ret = 0;
+        goto cleanup;
+    }
+
+    if (!(qemuCaps->cpuDefinitions = virDomainCapsCPUModelsNew(n)))
+        goto cleanup;
+
+    for (i = 0; i < n; i++) {
+        if (!(str = virXMLPropString(nodes[i], "name"))) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("missing cpu name in QEMU capabilities cache"));
+            goto cleanup;
+        }
+
+        if (virDomainCapsCPUModelsAddSteal(qemuCaps->cpuDefinitions,
+                                           &str,
+                                           VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
+            goto cleanup;
+    }
+
+    ret = 0;
+
+ cleanup:
+    VIR_FREE(nodes);
+    VIR_FREE(str);
+    return ret;
+}
+
+
 /*
  * Parsing a doc that looks like
  *
@@ -3130,30 +3176,8 @@ virQEMUCapsLoadCache(virCapsPtr caps,
     }
     VIR_FREE(str);
 
-    if ((n = virXPathNodeSet("./cpu", ctxt, &nodes)) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("failed to parse qemu capabilities cpus"));
+    if (virQEMUCapsLoadCPUModels(qemuCaps, ctxt) < 0)
         goto cleanup;
-    }
-    if (n > 0) {
-        if (!(qemuCaps->cpuDefinitions = virDomainCapsCPUModelsNew(n)))
-            goto cleanup;
-
-        for (i = 0; i < n; i++) {
-            if (!(str = virXMLPropString(nodes[i], "name"))) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("missing cpu name in QEMU capabilities cache"));
-                goto cleanup;
-            }
-
-            if (virDomainCapsCPUModelsAddSteal(qemuCaps->cpuDefinitions,
-                                               &str,
-                                               VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
-                goto cleanup;
-        }
-    }
-    VIR_FREE(nodes);
-
 
     if ((n = virXPathNodeSet("./machine", ctxt, &nodes)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-- 
2.10.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list