mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-04 11:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Maydell
2019-07-29 17:11:18 +01:00
parent 893dc8300c ff656fcd33
commit 34e2746bca
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/i386/cpu.c
View File

@@ -2472,7 +2472,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
.model_id = "Intel Xeon Processor (Icelake)", .model_id = "Intel Xeon Processor (Icelake)",
}, },
{ {
.name = "SnowRidge-Server", .name = "Snowridge",
.level = 27, .level = 27,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
@@ -2490,7 +2490,6 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_FXSR | CPUID_SSE | CPUID_SSE2, CPUID_FXSR | CPUID_SSE | CPUID_SSE2,
.features[FEAT_1_ECX] = .features[FEAT_1_ECX] =
CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_MONITOR | CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_MONITOR |
CPUID_EXT_VMX |
CPUID_EXT_SSSE3 | CPUID_EXT_SSSE3 |
CPUID_EXT_CX16 | CPUID_EXT_CX16 |
CPUID_EXT_SSE41 | CPUID_EXT_SSE41 |