Commit 1e0cf63987 for qemu.org

commit 1e0cf63987ae6353a72ad80f0a3e6e8b0f9f076a
Author: Peter Maydell <peter.maydell@linaro.org>
Date:   Mon Mar 30 16:13:09 2026 +0100

    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>

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index d02f6f0653..3b0a7c7363 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -9628,9 +9628,9 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
     if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_MPX) &&
         (env->features[FEAT_7_1_EDX] & CPUID_7_1_EDX_APXF)) {
         mark_unavailable_features(cpu, FEAT_7_0_EBX, CPUID_7_0_EBX_MPX,
-            "this feature is conflict with APX");
+            "this feature conflicts with APX");
         mark_unavailable_features(cpu, FEAT_7_1_EDX, CPUID_7_1_EDX_APXF,
-            "this feature is conflict with MPX");
+            "this feature conflicts with MPX");
     }

     x86_cpu_enable_xsave_components(cpu);