diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2013-04-22 16:00:12 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-05-01 23:21:02 +0200 |
| commit | 90e4b0c3de2b3927e71f23d95c3c27d60e5c89cc (patch) | |
| tree | 4c504a3f02624a077cd7f6607bd51f9e613776b7 | |
| parent | c649983b582687bbdb4019e308f015913e31065e (diff) | |
target-i386: Group together level, xlevel, xlevel2 fields
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>
| -rw-r--r-- | target-i386/cpu.c | 4 | ||||
| -rw-r--r-- | target-i386/cpu.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bba41fec69..081b5796e3 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -350,6 +350,8 @@ static void add_flagname_to_bitmaps(const char *flagname, typedef struct x86_def_t { const char *name; uint32_t level; + uint32_t xlevel; + uint32_t xlevel2; /* vendor is zero-terminated, 12 character ASCII string */ char vendor[CPUID_VENDOR_SZ + 1]; int family; @@ -357,11 +359,9 @@ typedef struct x86_def_t { int stepping; uint32_t features, ext_features, ext2_features, ext3_features; uint32_t kvm_features, svm_features; - uint32_t xlevel; char model_id[48]; /* Store the results of Centaur's CPUID instructions */ uint32_t ext4_features; - uint32_t xlevel2; /* The feature bits on CPUID[EAX=7,ECX=0].EBX */ uint32_t cpuid_7_0_ebx_features; } x86_def_t; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index f193752e5e..5d16428360 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -836,19 +836,19 @@ typedef struct CPUX86State { /* processor features (e.g. for CPUID insn) */ uint32_t cpuid_level; + uint32_t cpuid_xlevel; + uint32_t cpuid_xlevel2; uint32_t cpuid_vendor1; uint32_t cpuid_vendor2; uint32_t cpuid_vendor3; uint32_t cpuid_version; uint32_t cpuid_features; uint32_t cpuid_ext_features; - uint32_t cpuid_xlevel; uint32_t cpuid_model[12]; uint32_t cpuid_ext2_features; uint32_t cpuid_ext3_features; uint32_t cpuid_apic_id; /* Store the results of Centaur's CPUID instructions */ - uint32_t cpuid_xlevel2; uint32_t cpuid_ext4_features; /* Flags from CPUID[EAX=7,ECX=0].EBX */ uint32_t cpuid_7_0_ebx_features; |