From 5a2d0e57ad5ce1cf6bf0334feb5adc38896bea80 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 5 Oct 2009 22:41:04 +0200 Subject: [PATCH] target-i386: move recently added vmstate fields at the end of the structure This reduce the impact on hosts that have addressing modes with limited offsets. Suggested by Laurent Desnogues. Signed-off-by: Aurelien Jarno --- target-i386/cpu.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index a1107a2772..5929d28139 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -611,9 +611,6 @@ typedef struct CPUX86State { /* FPU state */ unsigned int fpstt; /* top of stack index */ uint16_t fpus; - uint16_t fpus_vmstate; - uint16_t fptag_vmstate; - uint16_t fpregs_format_vmstate; uint16_t fpuc; uint8_t fptags[8]; /* 0 = valid, 1 = empty */ FPReg fpregs[8]; @@ -695,7 +692,6 @@ typedef struct CPUX86State { /* For KVM */ uint64_t interrupt_bitmap[256 / 64]; - int32_t pending_irq_vmstate; uint32_t mp_state; /* in order to simplify APIC support, we leave this pointer to the @@ -708,6 +704,12 @@ typedef struct CPUX86State { uint64 mce_banks[MCE_BANKS_DEF*4]; uint64_t tsc_aux; + + /* vmstate */ + uint16_t fpus_vmstate; + uint16_t fptag_vmstate; + uint16_t fpregs_format_vmstate; + int32_t pending_irq_vmstate; } CPUX86State; CPUX86State *cpu_x86_init(const char *cpu_model);