From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 7 Mar 2017 18:33:37 +0000 (+0100)
Subject: qemu: Refactor virQEMUCapsInitCPU
X-Git-Tag: v3.2.0-rc1~283
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f23862f46529333c9db0f98d640881594c6113c;p=thirdparty%2Flibvirt.git

qemu: Refactor virQEMUCapsInitCPU

The function is now called virQEMUCapsProbeHostCPU. Both the refactoring
and the change of the name is done for consistency with a new function
which will be introduced in the following commit.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 319600c304..08c66b0880 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1061,20 +1061,16 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
 }
 
 
-static int
-virQEMUCapsInitCPU(virCapsPtr caps,
-                   virArch arch)
+static virCPUDefPtr
+virQEMUCapsProbeHostCPU(virCapsPtr caps)
 {
     virNodeInfo nodeinfo;
 
     if (nodeGetInfo(&nodeinfo))
-        return -1;
-
-    if (!(caps->host.cpu = virCPUGetHost(arch, VIR_CPU_TYPE_HOST,
-                                         &nodeinfo, NULL, 0)))
-        return -1;
+        return NULL;
 
-    return 0;
+    return virCPUGetHost(caps->host.arch, VIR_CPU_TYPE_HOST,
+                         &nodeinfo, NULL, 0);
 }
 
 
@@ -1120,7 +1116,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
         VIR_WARN("Failed to query host NUMA topology, disabling NUMA capabilities");
     }
 
-    if (virQEMUCapsInitCPU(caps, hostarch) < 0)
+    if (!(caps->host.cpu = virQEMUCapsProbeHostCPU(caps)))
         VIR_WARN("Failed to get host CPU");
 
     /* Add the power management features of the host */