External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 14:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Refactor virQEMUCapsFormatAccel

Browse Source 
And make it use virQEMUCapsGetAccel once rather than repeating the same
code in all functions called from virQEMUCapsFormatAccel.

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-23 13:00:31 +02:00
parent 4fd90d06e6
commit fa4db8ed6a
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_capabilities.c
View File

@ -3907,12 +3907,11 @@ virQEMUCapsLoadCache(virArch hostArch,
static void
virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsAccelPtr caps,
virBufferPtr buf,
virDomainVirtType type)
const char *typeStr)
{
qemuMonitorCPUModelInfoPtr model = virQEMUCapsGetCPUModelInfo(qemuCaps, type);
const char *typeStr = type == VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg";
qemuMonitorCPUModelInfoPtr model = caps->hostCPU.info;
size_t i;
if (!model)
@ -3962,22 +3961,13 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
static void
virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps,
virQEMUCapsFormatCPUModels(virQEMUCapsAccelPtr caps,
virBufferPtr buf,
virDomainVirtType type)
const char *typeStr)
{
qemuMonitorCPUDefsPtr defs;
const char *typeStr;
qemuMonitorCPUDefsPtr defs = caps->cpuModels;
size_t i;
if (type == VIR_DOMAIN_VIRT_KVM) {
typeStr = "kvm";
defs = qemuCaps->kvm.cpuModels;
} else {
typeStr = "tcg";
defs = qemuCaps->tcg.cpuModels;
}
if (!defs)
return;
@ -4015,8 +4005,11 @@ virQEMUCapsFormatAccel(virQEMUCapsPtr qemuCaps,
virBufferPtr buf,
virDomainVirtType type)
{
virQEMUCapsFormatHostCPUModelInfo(qemuCaps, buf, type);
virQEMUCapsFormatCPUModels(qemuCaps, buf, type);
virQEMUCapsAccelPtr caps = virQEMUCapsGetAccel(qemuCaps, type);
const char *typeStr = type == VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg";
virQEMUCapsFormatHostCPUModelInfo(caps, buf, typeStr);
virQEMUCapsFormatCPUModels(caps, buf, typeStr);
}