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

target-i386: Group together level, xlevel, xlevel2 fields

Browse Source 
Consolidate level, xlevel, xlevel2 fields in x86_def_t and CPUX86State.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2013-04-22 16:00:12 -03:00 committed by Andreas Färber
parent c649983b58
commit 90e4b0c3de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-i386/cpu.c
View File

@ -350,6 +350,8 @@ static void add_flagname_to_bitmaps(const char *flagname,
typedef struct x86_def_t { typedef struct x86_def_t {
const char *name; const char *name;
uint32_t level; uint32_t level;
uint32_t xlevel;
uint32_t xlevel2;
/* vendor is zero-terminated, 12 character ASCII string */ /* vendor is zero-terminated, 12 character ASCII string */
char vendor[CPUID_VENDOR_SZ + 1]; char vendor[CPUID_VENDOR_SZ + 1];
int family; int family;
@ -357,11 +359,9 @@ typedef struct x86_def_t {
int stepping; int stepping;
uint32_t features, ext_features, ext2_features, ext3_features; uint32_t features, ext_features, ext2_features, ext3_features;
uint32_t kvm_features, svm_features; uint32_t kvm_features, svm_features;
uint32_t xlevel;
char model_id[48]; char model_id[48];
/* Store the results of Centaur's CPUID instructions */ /* Store the results of Centaur's CPUID instructions */
uint32_t ext4_features; uint32_t ext4_features;
uint32_t xlevel2;
/* The feature bits on CPUID[EAX=7,ECX=0].EBX */ /* The feature bits on CPUID[EAX=7,ECX=0].EBX */
uint32_t cpuid_7_0_ebx_features; uint32_t cpuid_7_0_ebx_features;
} x86_def_t; } x86_def_t;

4
target-i386/cpu.h
View File

@ -836,19 +836,19 @@ typedef struct CPUX86State {
/* processor features (e.g. for CPUID insn) */ /* processor features (e.g. for CPUID insn) */
uint32_t cpuid_level; uint32_t cpuid_level;
uint32_t cpuid_xlevel;
uint32_t cpuid_xlevel2;
uint32_t cpuid_vendor1; uint32_t cpuid_vendor1;
uint32_t cpuid_vendor2; uint32_t cpuid_vendor2;
uint32_t cpuid_vendor3; uint32_t cpuid_vendor3;
uint32_t cpuid_version; uint32_t cpuid_version;
uint32_t cpuid_features; uint32_t cpuid_features;
uint32_t cpuid_ext_features; uint32_t cpuid_ext_features;
uint32_t cpuid_xlevel;
uint32_t cpuid_model[12]; uint32_t cpuid_model[12];
uint32_t cpuid_ext2_features; uint32_t cpuid_ext2_features;
uint32_t cpuid_ext3_features; uint32_t cpuid_ext3_features;
uint32_t cpuid_apic_id; uint32_t cpuid_apic_id;
/* Store the results of Centaur's CPUID instructions */ /* Store the results of Centaur's CPUID instructions */
uint32_t cpuid_xlevel2;
uint32_t cpuid_ext4_features; uint32_t cpuid_ext4_features;
/* Flags from CPUID[EAX=7,ECX=0].EBX */ /* Flags from CPUID[EAX=7,ECX=0].EBX */
uint32_t cpuid_7_0_ebx_features; uint32_t cpuid_7_0_ebx_features;