From c0030410342af23087c9cf496d9341b3b4f5c6f3 Mon Sep 17 00:00:00 2001 From: Collin Walling Date: Thu, 24 Sep 2020 20:22:35 -0400 Subject: [PATCH] qemu: check for model-expansion cap before baselining Hypervisor-cpu-baseline requires the cpu-model-expansion capability when expanding CPU model features if the --features flag is provided. Signed-off-by: Collin Walling Reviewed-by: Jiri Denemark --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 20e24e2479..5bdc698848 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12526,7 +12526,8 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, (const char **)features, migratable))) goto cleanup; } else if (ARCH_IS_S390(arch) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_BASELINE)) { + virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_BASELINE) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { bool expand_features = (flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES); if (!(cpu = qemuConnectCPUModelBaseline(qemuCaps, cfg->libDir,