commit 90e4b0c3de2b3927e71f23d95c3c27d60e5c89cc
author Eduardo Habkost <ehabkost@redhat.com> Mon Apr 22 16:00:12 2013 -0300
committer Andreas Färber <afaerber@suse.de> Wed May 01 23:21:02 2013 +0200
tree 4c504a3f02624a077cd7f6607bd51f9e613776b7
parent c649983b582687bbdb4019e308f015913e31065e

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>

target-i386/cpu.c

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index bba41fe..081b579 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -350,6 +350,8 @@
 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 @@
     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;