From: Luwei Kang Date: Tue, 30 Jun 2020 06:38:33 +0000 (+0800) Subject: target/i386: Correct the warning message of Intel PT X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cbe0dad1906d29d9ea83169b672e9e709c9fc1f8;p=qemu.git target/i386: Correct the warning message of Intel PT The CPUID level need to be set to 0x14 manually on old machine-type if Intel PT is enabled in guest. E.g. the CPUID[0].EAX(level)=7 and CPUID[7].EBX[25](intel-pt)=1 when the Qemu with "-machine pc-i440fx-3.1 -cpu qemu64,+intel-pt" parameter. This patch corrects the warning message of the previous submission(ddc2fc9). Signed-off-by: Luwei Kang Message-Id: <1593499113-4768-1-git-send-email-luwei.kang@intel.com> Signed-off-by: Paolo Bonzini --- diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 105eb47eab..1dde34dce7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6398,7 +6398,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp) } else if (cpu->env.cpuid_min_level < 0x14) { mark_unavailable_features(cpu, FEAT_7_0_EBX, CPUID_7_0_EBX_INTEL_PT, - "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,+intel-pt,level=0x14\""); + "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,+intel-pt,min-level=0x14\""); } }