From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 23 Oct 2019 16:05:45 +0000 (+0200)
Subject: qemu: Split out virQEMUCapsLoadCache
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=299f12ad1fc2d2a7addd02a8891682aa6e0c2e19;p=libvirt.git

qemu: Split out virQEMUCapsLoadCache

All the code for loading machine type data was moved to a standalone
virQEMUCapsLoadMachines function.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 53c96b248f..a66a00b7ae 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3556,6 +3556,60 @@ virQEMUCapsLoadCPUModels(virQEMUCapsAccelPtr caps,
 }
 
 
+static int
+virQEMUCapsLoadMachines(virQEMUCapsPtr qemuCaps,
+                        xmlXPathContextPtr ctxt)
+{
+    g_autofree xmlNodePtr *nodes = NULL;
+    char *str = NULL;
+    size_t i;
+    int n;
+
+    if ((n = virXPathNodeSet("./machine", ctxt, &nodes)) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("failed to parse qemu capabilities machines"));
+        return -1;
+    }
+
+    if (n == 0)
+        return 0;
+
+    qemuCaps->nmachineTypes = n;
+    if (VIR_ALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes) < 0)
+        return -1;
+
+    for (i = 0; i < n; i++) {
+        if (!(qemuCaps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("missing machine name in QEMU capabilities cache"));
+            return -1;
+        }
+        qemuCaps->machineTypes[i].alias = virXMLPropString(nodes[i], "alias");
+
+        str = virXMLPropString(nodes[i], "maxCpus");
+        if (str &&
+            virStrToLong_ui(str, NULL, 10, &(qemuCaps->machineTypes[i].maxCpus)) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("malformed machine cpu count in QEMU capabilities cache"));
+            return -1;
+        }
+        VIR_FREE(str);
+
+        str = virXMLPropString(nodes[i], "hotplugCpus");
+        if (STREQ_NULLABLE(str, "yes"))
+            qemuCaps->machineTypes[i].hotplugCpus = true;
+        VIR_FREE(str);
+
+        str = virXMLPropString(nodes[i], "default");
+        if (STREQ_NULLABLE(str, "yes"))
+            qemuCaps->machineTypes[i].qemuDefault = true;
+        VIR_FREE(str);
+    }
+
+    return 0;
+}
+
+
 static int
 virQEMUCapsLoadAccel(virQEMUCapsPtr qemuCaps,
                      xmlXPathContextPtr ctxt,
@@ -3789,45 +3843,8 @@ virQEMUCapsLoadCache(virArch hostArch,
         virQEMUCapsLoadAccel(qemuCaps, ctxt, VIR_DOMAIN_VIRT_QEMU) < 0)
         goto cleanup;
 
-    if ((n = virXPathNodeSet("./machine", ctxt, &nodes)) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("failed to parse qemu capabilities machines"));
+    if (virQEMUCapsLoadMachines(qemuCaps, ctxt) < 0)
         goto cleanup;
-    }
-    if (n > 0) {
-        qemuCaps->nmachineTypes = n;
-        if (VIR_ALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes) < 0)
-            goto cleanup;
-
-        for (i = 0; i < n; i++) {
-            if (!(qemuCaps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("missing machine name in QEMU capabilities cache"));
-                goto cleanup;
-            }
-            qemuCaps->machineTypes[i].alias = virXMLPropString(nodes[i], "alias");
-
-            str = virXMLPropString(nodes[i], "maxCpus");
-            if (str &&
-                virStrToLong_ui(str, NULL, 10, &(qemuCaps->machineTypes[i].maxCpus)) < 0) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("malformed machine cpu count in QEMU capabilities cache"));
-                goto cleanup;
-            }
-            VIR_FREE(str);
-
-            str = virXMLPropString(nodes[i], "hotplugCpus");
-            if (STREQ_NULLABLE(str, "yes"))
-                qemuCaps->machineTypes[i].hotplugCpus = true;
-            VIR_FREE(str);
-
-            str = virXMLPropString(nodes[i], "default");
-            if (STREQ_NULLABLE(str, "yes"))
-                qemuCaps->machineTypes[i].qemuDefault = true;
-            VIR_FREE(str);
-        }
-    }
-    VIR_FREE(nodes);
 
     if ((n = virXPathNodeSet("./gic", ctxt, &nodes)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",