From: Aidan Khoury Date: Sat, 7 Feb 2026 13:40:11 +0000 (+0100) Subject: i386/cpu: Fix incorrect initializer in Diamond Rapids definition X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f0dd09e61b080c27589fe35b575503783c5a256;p=thirdparty%2Fqemu.git i386/cpu: Fix incorrect initializer in Diamond Rapids definition The new Diamond Rapids x86 cpu model definition that was added in 7a6dd8bde1 has an unexpected comma in the `.features[FEAT_VMX_EXIT_CTLS]` subobject initializer, causing the prior initialization to be overridden. For this reason `VMX_VM_EXIT_SAVE_DEBUG_CONTROLS | VMX_VM_EXIT_HOST_ADDR_SPACE_SIZE` is not included. Fix this by replacing the comma with the missing bitwise OR to properly combine all the flags into a single bitmask value. Fixes: 7a6dd8bde159 ("i386/cpu: Add CPU model for Diamond Rapids") Signed-off-by: Aidan Khoury --- diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 201c5d5c21..eaa01438c1 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5579,7 +5579,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { MSR_VMX_EPT_INVVPID_ALL_CONTEXT | MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT_NOGLOBALS, .features[FEAT_VMX_EXIT_CTLS] = - VMX_VM_EXIT_SAVE_DEBUG_CONTROLS | VMX_VM_EXIT_HOST_ADDR_SPACE_SIZE, + VMX_VM_EXIT_SAVE_DEBUG_CONTROLS | VMX_VM_EXIT_HOST_ADDR_SPACE_SIZE | VMX_VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | VMX_VM_EXIT_ACK_INTR_ON_EXIT | VMX_VM_EXIT_SAVE_IA32_PAT | VMX_VM_EXIT_LOAD_IA32_PAT | VMX_VM_EXIT_SAVE_IA32_EFER |