From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk6mb-0002Ge-8B for qemu-devel@nongnu.org; Wed, 14 Sep 2016 05:47:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bk6mW-0005dB-8M for qemu-devel@nongnu.org; Wed, 14 Sep 2016 05:47:08 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk6mW-0005cy-1p for qemu-devel@nongnu.org; Wed, 14 Sep 2016 05:47:04 -0400 Received: by mail-wm0-f65.google.com with SMTP id c131so1688462wmh.2 for ; Wed, 14 Sep 2016 02:47:03 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 14 Sep 2016 11:45:59 +0200 Message-Id: <1473846359-18023-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] target-i386: fix ordering of fields in CPUX86State List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com Make sure reset zeroes TSC_AUX, XCR0, PKRU. Move XSTATE_BV from the "vmstate only" section to the "KVM only" section. Signed-off-by: Paolo Bonzini --- target-i386/cpu.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index bb3ffda..58e43b6 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1035,6 +1035,9 @@ typedef struct CPUX86State { uint64_t tsc; uint64_t tsc_adjust; uint64_t tsc_deadline; + uint64_t tsc_aux; + + uint64_t xcr0; uint64_t mcg_status; uint64_t msr_ia32_misc_enable; @@ -1051,6 +1054,8 @@ typedef struct CPUX86State { uint64_t pat; uint32_t smbase; + uint32_t pkru; + /* End of state preserved by INIT (dummy marker). */ struct {} end_init_save; @@ -1135,20 +1140,15 @@ typedef struct CPUX86State { uint64_t mcg_ctl; uint64_t mcg_ext_ctl; uint64_t mce_banks[MCE_BANKS_DEF*4]; - - uint64_t tsc_aux; + uint64_t xstate_bv; /* vmstate */ uint16_t fpus_vmstate; uint16_t fptag_vmstate; uint16_t fpregs_format_vmstate; - uint64_t xstate_bv; - uint64_t xcr0; uint64_t xss; - uint32_t pkru; - TPRAccess tpr_access_type; } CPUX86State; -- 2.7.4