From 7e3e31444c7061af5d705fca4b1b703875cba37e Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Fri, 20 Sep 2019 22:54:13 +0200 Subject: [PATCH] qemu: Use virQEMUCapsGetCPUDefinitions more MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- src/qemu/qemu_capabilities.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 65260c77df..e34f3f22e5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5277,24 +5277,17 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps, if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype, VIR_CPU_MODE_CUSTOM)) { - virDomainCapsCPUModelsPtr filtered = NULL; - char **models = NULL; const char *blacklist[] = { "host", NULL }; + VIR_AUTOSTRINGLIST models = NULL; if (virCPUGetModels(domCaps->arch, &models) >= 0) { - virDomainCapsCPUModelsPtr cpus; - - if (domCaps->virttype == VIR_DOMAIN_VIRT_KVM) - cpus = qemuCaps->kvmCPUModels; - else - cpus = qemuCaps->tcgCPUModels; - - filtered = virDomainCapsCPUModelsFilter(cpus, - (const char **)models, - blacklist); - virStringListFree(models); + domCaps->cpu.custom = virQEMUCapsGetCPUDefinitions(qemuCaps, + domCaps->virttype, + (const char **)models, + blacklist); + } else { + domCaps->cpu.custom = NULL; } - domCaps->cpu.custom = filtered; } } -- 2.47.2