diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-29 17:11:18 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-29 17:11:18 +0100 |
| commit | 34e2746bca222db7cd22f1481bb24e54d2765bc1 (patch) | |
| tree | 91042a47bfb99d3b48a5062bb4b82aa5d2e622a4 | |
| parent | 893dc8300c80e3dc32f31e968cf7aa0904da50c3 (diff) | |
| parent | ff656fcd338a70c4d9783a800733c4ab3806e5b0 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/i386/cpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index e3320f5e92..19751e37a7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -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 | |