target/i386/cpu.c: Correct minor grammar error in warning
Fix a minor error in the grammar of the warning messages produced if both MPX and APX are enabled: $ ./build/x86/qemu-system-x86_64 -cpu max -accel qtest -S qemu-system-x86_64: warning: this feature conflicts with APX: CPUID[eax=07h,ecx=00h].EBX.mpx [bit 14] qemu-system-x86_64: warning: this feature conflicts with MPX: CPUID[eax=07h,ecx=01h].EDX.apxf [bit 21] Fixes: 91bc4d81078a ("i386/cpu: Add APX EGPRs into xsave area") Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20260330151309.1786787-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Peter Maydell committed
Mar 30, 2026 at 16:13 UTC
1e0cf63987ae6353a72ad80f0a3e6e8b0f9f076a
1 file changed
+2
-2
target/i386/cpu.c
+2
-2
@@ -9628,9 +9628,9 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
9628
if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_MPX) &&
9629
(env->features[FEAT_7_1_EDX] & CPUID_7_1_EDX_APXF)) {
9630
mark_unavailable_features(cpu, FEAT_7_0_EBX, CPUID_7_0_EBX_MPX,
9631
- "this feature is conflict with APX");
9631
+ "this feature conflicts with APX");
9632
mark_unavailable_features(cpu, FEAT_7_1_EDX, CPUID_7_1_EDX_APXF,
9633
- "this feature is conflict with MPX");
9633
+ "this feature conflicts with MPX");
9634
}
9635
9636
x86_cpu_enable_xsave_components(cpu);