From: Paolo Bonzini Date: Tue, 11 Feb 2020 17:47:48 +0000 (+0100) Subject: target/i386: enable monitor and ucode revision with -cpu max X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=be02cda3afde60d219786e23c3f8edb53aec8e17;p=qemu.git 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 --- diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 32efa46852..92fafa2659 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6414,7 +6414,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) error_setg(&local_err, "CPU model '%s' requires KVM", name); goto out; } + } + if (cpu->max_features && accel_uses_host_cpuid()) { if (enable_cpu_pm) { host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx, &cpu->mwait.ecx, &cpu->mwait.edx);