[libvirt] [PATCH 05/11] qemu: Update query-cpu-model-expansion check

CPU features are available on ARM only wherever the query-cpu-model-expansion QMP command is available, same as on s390. Update qemuBuildCpuModelArgStr() to reflect this fact. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; Tested-by: Andrew Jones <drjones(a)redhat.com&gt; --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index be9839cc64..f37aecda37 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6703,7 +6703,8 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, break; } - if (ARCH_IS_S390(def->os.arch) && cpu->features && + if ((ARCH_IS_S390(def->os.arch) || ARCH_IS_ARM(def->os.arch)) && + cpu->features && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU features not supported by hypervisor for %s " -- 2.21.0