From fa4db8ed6a2f92d33520ea075df073097c33cd8e Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Wed, 23 Oct 2019 13:00:31 +0200 Subject: [PATCH] qemu: Refactor virQEMUCapsFormatAccel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And make it use virQEMUCapsGetAccel once rather than repeating the same code in all functions called from virQEMUCapsFormatAccel. Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- src/qemu/qemu_capabilities.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cc5f8d348e..86cf63df4e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -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); }