Commit 34e2746b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging 



x86 queue for 4.1

* Rename and fix SnowRidge CPU model (Paul Lai)

# gpg: Signature made Mon 29 Jul 2019 17:09:34 BST
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-next-pull-request:
  i386: Fix Snowridge CPU model name and features

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 893dc830 ff656fcd

target/i386/cpu.c

+1 −2
Original line number Diff line number Diff line
@@ -2472,7 +2472,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
        .model_id = "Intel Xeon Processor (Icelake)",

    },

    {

        .name = "SnowRidge-Server",

        .name = "Snowridge",

        .level = 27,

        .vendor = CPUID_VENDOR_INTEL,

        .family = 6,
@@ -2490,7 +2490,6 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_FXSR | CPUID_SSE | CPUID_SSE2,

        .features[FEAT_1_ECX] =

            CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_MONITOR |

            CPUID_EXT_VMX |

            CPUID_EXT_SSSE3 |

            CPUID_EXT_CX16 |

            CPUID_EXT_SSE41 |