External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Split virQEMUCapsFetchCPUModels

Browse Source 
Most of the code moved to a new virQEMUCapsFetchCPUDefinitions function
and the existing virQEMUCapsFetchCPUModels just becomes a small wrapper
around virQEMUCapsFetchCPUDefinitions and virQEMUCapsCPUDefsToModels.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-10-09 10:16:17 +02:00
parent 76baa994b7
commit 857b88f5c3
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_capabilities.c
View File

@ -2470,15 +2470,15 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps,
} }
int static int
virQEMUCapsFetchCPUModels(qemuMonitorPtr mon, virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon,
virArch arch, virArch arch,
virDomainCapsCPUModelsPtr *cpuModels) qemuMonitorCPUDefsPtr *cpuDefs)
{ {
g_autoptr(qemuMonitorCPUDefs) defs = NULL; g_autoptr(qemuMonitorCPUDefs) defs = NULL;
size_t i; size_t i;
*cpuModels = NULL; *cpuDefs = NULL;
if (qemuMonitorGetCPUDefinitions(mon, &defs) < 0) if (qemuMonitorGetCPUDefinitions(mon, &defs) < 0)
return -1; return -1;
@ -2506,7 +2506,24 @@ virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
} }
} }
if (!(*cpuModels = virQEMUCapsCPUDefsToModels(defs, NULL, NULL))) *cpuDefs = g_steal_pointer(&defs);
return 0;
}
int
virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
virArch arch,
virDomainCapsCPUModelsPtr *cpuModels)
{
g_autoptr(qemuMonitorCPUDefs) defs = NULL;
*cpuModels = NULL;
if (virQEMUCapsFetchCPUDefinitions(mon, arch, &defs) < 0)
return -1;
if (defs && !(*cpuModels = virQEMUCapsCPUDefsToModels(defs, NULL, NULL)))
return -1; return -1;
return 0; return 0;