1. Patchew
  2. QEMU
  3. [PULL v2 00/41] QOM, target/i386 patches for 2026-02-12
  4. View patch

[PULL v2 29/41] i386/cpu: Fix incorrect initializer in Diamond Rapids definition

Paolo Bonzini posted 41 patches 1 month, 3 weeks ago
Only 1 patches received!
[PULL v2 29/41] i386/cpu: Fix incorrect initializer in Diamond Rapids definition
Posted by Paolo Bonzini 1 month, 3 weeks ago 
From: Aidan Khoury <aidan@aktech.ai>

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 <aidan@aktech.ai>
---
 target/i386/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 201c5d5c210..eaa01438c1b 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 |
-- 
2.52.0
Re: [PULL v2 29/41] i386/cpu: Fix incorrect initializer in Diamond Rapids definition
Posted by Daniel P. Berrangé 1 month, 3 weeks ago 
On Fri, Feb 13, 2026 at 11:21:09AM +0100, Paolo Bonzini wrote:
> From: Aidan Khoury <aidan@aktech.ai>
> 
> 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 <aidan@aktech.ai>

That's missing your S-o-B

> ---
>  target/i386/cpu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 201c5d5c210..eaa01438c1b 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 |
> -- 
> 2.52.0
> 
> 

With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|
Re: [PULL v2 29/41] i386/cpu: Fix incorrect initializer in Diamond Rapids definition
Posted by Peter Maydell 1 month, 3 weeks ago 
On Fri, 13 Feb 2026 at 11:09, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Fri, Feb 13, 2026 at 11:21:09AM +0100, Paolo Bonzini wrote:
> > From: Aidan Khoury <aidan@aktech.ai>
> >
> > 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 <aidan@aktech.ai>
>
> That's missing your S-o-B


I have this pullreq tested and ready to apply -- do you think this
is important enough to respin?

-- PMM
Re: [PULL v2 29/41] i386/cpu: Fix incorrect initializer in Diamond Rapids definition
Posted by Daniel P. Berrangé 1 month, 3 weeks ago 
On Fri, Feb 13, 2026 at 11:48:29AM +0000, Peter Maydell wrote:
> On Fri, 13 Feb 2026 at 11:09, Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > On Fri, Feb 13, 2026 at 11:21:09AM +0100, Paolo Bonzini wrote:
> > > From: Aidan Khoury <aidan@aktech.ai>
> > >
> > > 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 <aidan@aktech.ai>
> >
> > That's missing your S-o-B
> 
> 
> I have this pullreq tested and ready to apply -- do you think this
> is important enough to respin?

I'm not that fussed if it is just 1 out of the 41 patches, but I've
not received the other patches in this pull so haven't checked.


With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|
Re: [PULL v2 29/41] i386/cpu: Fix incorrect initializer in Diamond Rapids definition
Posted by Peter Maydell 1 month, 3 weeks ago 
On Fri, 13 Feb 2026 at 11:52, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Fri, Feb 13, 2026 at 11:48:29AM +0000, Peter Maydell wrote:
> > On Fri, 13 Feb 2026 at 11:09, Daniel P. Berrangé <berrange@redhat.com> wrote:
> > >
> > > On Fri, Feb 13, 2026 at 11:21:09AM +0100, Paolo Bonzini wrote:
> > > > From: Aidan Khoury <aidan@aktech.ai>
> > > >
> > > > 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 <aidan@aktech.ai>
> > >
> > > That's missing your S-o-B
> >
> >
> > I have this pullreq tested and ready to apply -- do you think this
> > is important enough to respin?
>
> I'm not that fussed if it is just 1 out of the 41 patches, but I've
> not received the other patches in this pull so haven't checked.

Looks like it was just this one patch.

-- PMM
  • [PULL v2 29/41] i386/cpu: Fix incorrect initializer in Diamond Rapids definition

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.