@@ -155,15 +155,12 @@ static x86_def_t x86_defs[] = {
.family = 6,
.model = 2,
.stepping = 3,
- .features = PPRO_FEATURES |
- /* these features are needed for Win64 and aren't fully implemented */
- CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
- /* this feature is needed for Solaris and isn't fully implemented */
- CPUID_PSE36,
- .ext_features = CPUID_EXT_SSE3,
- .ext2_features = (PPRO_FEATURES & EXT2_FEATURE_MASK) |
- CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
- .ext3_features = CPUID_EXT3_SVM,
+ .features = TCG_FEATURES,
+ .ext_features = TCG_EXT_FEATURES,
+ /* 3DNow! is deprecated, so leave it out of the default feature set */
+ .ext2_features = (TCG_EXT2_FEATURES | EXT2_FEATURES_64) &
+ ~(CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT),
+ .ext3_features = TCG_EXT3_FEATURES,
.xlevel = 0x8000000A,
.model_id = "QEMU Virtual CPU version " QEMU_VERSION,
},
@@ -249,9 +246,13 @@ static x86_def_t x86_defs[] = {
.family = 6,
.model = 3,
.stepping = 3,
- .features = PPRO_FEATURES,
- .ext_features = CPUID_EXT_SSE3,
- .xlevel = 0,
+ .features = TCG_FEATURES,
+ .ext_features = TCG_EXT_FEATURES,
+ /* 3DNow! is deprecated, so leave it out of the default feature set */
+ .ext2_features = (TCG_EXT2_FEATURES) &
+ ~(CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT),
+ .ext3_features = TCG_EXT3_FEATURES,
+ .xlevel = 0x80000001,
.model_id = "QEMU Virtual CPU version " QEMU_VERSION,
},
{
Since we now have a real TCG feature set, use it to describe the artificial qemu CPUs (both 64 and 32-bit). If new features are added to TCG, the capability of qemu64/32 will automatically be adjusted. Signed-off-by: Andre Przywara <andre.przywara@amd.com> --- target-i386/cpuid.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-)