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@redhat.com>
Tested-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-07-02 15:29:30 +02:00
parent 42bc9d9a9a
commit 62e7d1fdc4

View File

@ -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 "