Received: from eggs.gnu.org ([208.118.235.92]:54389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URp2I-0002jw-HK for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:25:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URp2D-0001zV-73 for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:25:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URp2C-0001zK-TP for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:25:49 -0400 From: Eduardo Habkost Date: Mon, 15 Apr 2013 16:25:34 -0300 Message-Id: <1366053940-9401-2-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 1/7] target-i386: Move cpuid_xlevel, cpuid_xlevel2 fields in X86CPU 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 cpuid_*_features fields will be replaced by an array, put the level/xlevel/xlevel2 fields together in the struct, as they won't be close to the corresponding cpuid_*_features fields anymore. Signed-off-by: Eduardo Habkost --- target-i386/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index cf1b05c..500fe93 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -835,19 +835,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; -- 1.8.1.4