On Wed, 12 Dec 2012 20:22:24 -0200
Eduardo Habkost <ehabk...@redhat.com> wrote:
> Instead of repeating the (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES)
> expression everywhere, use EXT2_PPRO_FEATURES.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> target-i386/cpu.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 546c86a..a2ee8bb 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -303,6 +303,7 @@ typedef struct x86_def_t {
> CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | \
> CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | \
> CPUID_PAE | CPUID_SEP | CPUID_APIC)
> +#define EXT2_PPRO_FEATURES (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES)
>
> #define TCG_FEATURES (CPUID_FP87 | CPUID_PSE | CPUID_TSC | CPUID_MSR | \
> CPUID_PAE | CPUID_MCE | CPUID_CX8 | CPUID_APIC | CPUID_SEP | \
> @@ -350,7 +351,7 @@ static x86_def_t builtin_x86_defs[] = {
> CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
> CPUID_PSE36,
> .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT,
> - .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
> + .ext2_features = EXT2_PPRO_FEATURES |
> CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
> .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM |
> CPUID_EXT3_ABM | CPUID_EXT3_SSE4A,
> @@ -370,7 +371,7 @@ static x86_def_t builtin_x86_defs[] = {
> CPUID_PSE36 | CPUID_VME | CPUID_HT,
> .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_CX16 |
> CPUID_EXT_POPCNT,
> - .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
> + .ext2_features = EXT2_PPRO_FEATURES |
> CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX |
> CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT | CPUID_EXT2_MMXEXT |
> CPUID_EXT2_FFXSR | CPUID_EXT2_PDPE1GB | CPUID_EXT2_RDTSCP,
> @@ -421,7 +422,7 @@ static x86_def_t builtin_x86_defs[] = {
> /* Missing: CPUID_EXT_POPCNT, CPUID_EXT_MONITOR */
> .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16,
> /* Missing: CPUID_EXT2_PDPE1GB, CPUID_EXT2_RDTSCP */
> - .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
> + .ext2_features = EXT2_PPRO_FEATURES |
> CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
> /* Missing: CPUID_EXT3_LAHF_LM, CPUID_EXT3_CMP_LEG,
> CPUID_EXT3_EXTAPIC,
> CPUID_EXT3_CR8LEG, CPUID_EXT3_ABM, CPUID_EXT3_SSE4A,
> @@ -456,7 +457,7 @@ static x86_def_t builtin_x86_defs[] = {
> .features = PPRO_FEATURES |
> CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_PSE36,
> .ext_features = CPUID_EXT_SSE3,
> - .ext2_features = PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES,
> + .ext2_features = EXT2_PPRO_FEATURES,
> .ext3_features = 0,
> .xlevel = 0x80000008,
> .model_id = "Common 32-bit KVM processor"
> @@ -538,7 +539,7 @@ static x86_def_t builtin_x86_defs[] = {
> .stepping = 3,
> .features = PPRO_FEATURES | CPUID_PSE36 | CPUID_VME | CPUID_MTRR |
> CPUID_MCA,
> - .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
> + .ext2_features = EXT2_PPRO_FEATURES |
> CPUID_EXT2_MMXEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT,
> .xlevel = 0x80000008,
> },
> @@ -558,7 +559,7 @@ static x86_def_t builtin_x86_defs[] = {
> /* Some CPUs got no CPUID_SEP */
> .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_SSSE3
> |
> CPUID_EXT_DSCPL | CPUID_EXT_EST | CPUID_EXT_TM2 | CPUID_EXT_XTPR,
> - .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
> + .ext2_features = EXT2_PPRO_FEATURES |
> CPUID_EXT2_NX,
> .ext3_features = CPUID_EXT3_LAHF_LM,
> .xlevel = 0x8000000A,
> --
> 1.7.11.7
>
>
--
Regards,
Igor
