target/i386: enable monitor and ucode revision with -cpu max

These two features were incorrectly tied to host_cpuid_required rather than
cpu->max_features.  As a result, -cpu max was not enabling either MONITOR
features or ucode revision.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-02-11 18:47:48 +01:00
parent 6702514814
commit be02cda3af

View File

@ -6414,7 +6414,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
error_setg(&local_err, "CPU model '%s' requires KVM", name); error_setg(&local_err, "CPU model '%s' requires KVM", name);
goto out; goto out;
} }
}
if (cpu->max_features && accel_uses_host_cpuid()) {
if (enable_cpu_pm) { if (enable_cpu_pm) {
host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx, host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx,
&cpu->mwait.ecx, &cpu->mwait.edx); &cpu->mwait.ecx, &cpu->mwait.edx);