1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 01:18:00 +03:00

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>
This commit is contained in:
Jiri Denemark 2017-03-07 19:33:37 +01:00
parent 79a78c13ec
commit 4f23862f46

View File

@ -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;
return NULL;
if (!(caps->host.cpu = virCPUGetHost(arch, VIR_CPU_TYPE_HOST,
&nodeinfo, NULL, 0)))
return -1;
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 */