Received: from eggs.gnu.org ([208.118.235.92]:54380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URp2H-0002jI-P3 for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:25:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URp2G-00020P-A0 for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:25:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URp2F-00020C-Nm for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:25:51 -0400 From: Eduardo Habkost Date: Mon, 15 Apr 2013 16:25:36 -0300 Message-Id: <1366053940-9401-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1366053940-9401-1-git-send-email-ehabkost@redhat.com> References: <1366053940-9401-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [qom-cpu PATCH 3/7] target-i386: Move xlevel/xlevel2 in struct x86_def_t List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Igor Mammedov As the *_features fields are going to be replaced with a features array, the xlevel & xlevel2 fields won't be close to the corresponding *_features fields anymore. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e2302d8..732cafd 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -349,6 +349,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; @@ -356,11 +358,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; -- 1.8.1.4