mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X86 queue, 2015-07-15

Browse Source 
Two bug fixes:
 * Memory leak due to extra g_strdup() when registering X86CPU alias properties
 * Fix CPUID levels so that W10 insider can run as guest OS
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJVpsITAAoJECgHk2+YTcWmpWoP/i0h19rtC/JNv/dEArp7mZ+M
 0/prt0cLFHv16I4NxD1QdVZmf4CDkLSQqq24PU4uXk7SQmmKctrhDrYIGm0/CLV2
 1ouU51DpW8k1djyeDuJjBiPKwBxJXW9Nz8NaG1OoHp+gCvLVaW9f5IiI1uizACeP
 aDl4OIeQ0RSKzMX24e2hI/OqUkCOn2ao4Z1e0XeksPCa5LvGeQA5p+iQQ8qOSXLz
 g1syWj/nNKfhVj02bi/oaweagnGMGBswtCpQbylZkQdDW7Zjt6Rms/IyjRN/CwGy
 oEr10VHK1zFjg6CD8hHIVEH4Na4nVNjGqtQ/8UvX1pinP4nPv2Zq+8/vxGIVDSSL
 gDTWenErmRYqA6Iw9CV7ffMfG8DIhpiYa1805Sj9ZQtbPA1hnxXtEQ5cIqbnuF1W
 J4mnJVSDOQ4veQSI8znr917yazRhcRbLaDVzg9qg4CP8eF4Hg2jqNCyytp5qAnsc
 Sumn1SBgWEEsLh2c7ENJyL/3jfsTlETpG0sFjBVVto5Rj2YK8V13Jq3K+sQjcK1d
 umRss45JdCnWg8Z0GmLiHYsM05eyoIoX5UG/A5yB0XtqF/JxysY59k8qchkSkvjs
 VEDqpQ0rLPa0K8PhAIDQGze+aU6+q0blWhTe2GELrU0oFi5iSxodTqWx+8C4Jl5j
 9lhPndGkoO+6JZfwJWw7
 =x5/Y
 -----END PGP SIGNATURE-----

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

X86 queue, 2015-07-15

Two bug fixes:
* Memory leak due to extra g_strdup() when registering X86CPU alias properties
* Fix CPUID levels so that W10 insider can run as guest OS

# gpg: Signature made Wed Jul 15 21:26:59 2015 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: emulate CPUID level of real hardware
  target-i386: Don't strdup() alias property name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-07-15 22:05:13 +01:00
commit 3749c11a72
2 changed files with 87 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
include/hw/i386/pc.h
View File

@ -298,6 +298,74 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.driver = TYPE_X86_CPU,\
.property = "arat",\
.value = "off",\
},{\
.driver = "qemu64" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "kvm64" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(5),\
},{\
.driver = "pentium3" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(2),\
},{\
.driver = "n270" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(5),\
},{\
.driver = "Conroe" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "Penryn" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "Nehalem" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "n270" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Penryn" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Conroe" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Nehalem" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Westmere" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "SandyBridge" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Haswell" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Haswell-noTSX" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Broadwell" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Broadwell-noTSX" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},
#define PC_COMPAT_2_2 \

39
target-i386/cpu.c
View File

@ -695,7 +695,7 @@ struct X86CPUDefinition {
static X86CPUDefinition builtin_x86_defs[] = {
{
.name = "qemu64",
.level = 4,
.level = 0xd,
.vendor = CPUID_VENDOR_AMD,
.family = 6,
.model = 6,
@ -771,7 +771,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
},
{
.name = "kvm64",
.level = 5,
.level = 0xd,
.vendor = CPUID_VENDOR_INTEL,
.family = 15,
.model = 6,
@ -882,7 +882,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
},
{
.name = "pentium3",
.level = 2,
.level = 3,
.vendor = CPUID_VENDOR_INTEL,
.family = 6,
.model = 7,
@ -907,8 +907,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
},
{
.name = "n270",
/* original is on level 10 */
.level = 5,
.level = 10,
.vendor = CPUID_VENDOR_INTEL,
.family = 6,
.model = 28,
@ -928,12 +927,12 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_NX,
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz",
},
{
.name = "Conroe",
.level = 4,
.level = 10,
.vendor = CPUID_VENDOR_INTEL,
.family = 6,
.model = 15,
@ -950,12 +949,12 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Celeron_4x0 (Conroe/Merom Class Core 2)",
},
{
.name = "Penryn",
.level = 4,
.level = 10,
.vendor = CPUID_VENDOR_INTEL,
.family = 6,
.model = 23,
@ -973,12 +972,12 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)",
},
{
.name = "Nehalem",
.level = 4,
.level = 11,
.vendor = CPUID_VENDOR_INTEL,
.family = 6,
.model = 26,
@ -996,7 +995,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Core i7 9xx (Nehalem Class Core i7)",
},
{
@ -1022,7 +1021,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT3_LAHF_LM,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)",
},
{
@ -1053,7 +1052,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Xeon E312xx (Sandy Bridge)",
},
{
@ -1087,7 +1086,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge)",
},
{
@ -1123,7 +1122,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Core Processor (Haswell, no TSX)",
}, {
.name = "Haswell",
@ -1159,7 +1158,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Core Processor (Haswell)",
},
{
@ -1197,7 +1196,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Core Processor (Broadwell, no TSX)",
},
{
@ -1235,7 +1234,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A,
.xlevel = 0x80000008,
.model_id = "Intel Core Processor (Broadwell)",
},
{
@ -3021,7 +3020,7 @@ static void x86_cpu_register_feature_bit_props(X86CPU *cpu,
for (i = 1; names[i]; i++) {
feat2prop(names[i]);
object_property_add_alias(obj, names[i], obj, g_strdup(names[0]),
object_property_add_alias(obj, names[i], obj, names[0],
&error_abort);
}