Message ID | 1429904252-9841-3-git-send-email-ehabkost@redhat.com |
---|---|
State | New |
Headers | show |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 11da4b5..928e2be 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2595,7 +2595,7 @@ static void x86_cpu_reset(CPUState *s) xcc->parent_reset(s); - memset(env, 0, offsetof(CPUX86State, cpuid_level)); + memset(env, 0, offsetof(CPUX86State, end_reset_fields)); tlb_flush(s, 1); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 1d9f1d7..750b5b7 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -931,6 +931,7 @@ typedef struct CPUX86State { CPU_COMMON /* Fields from here on are preserved across CPU reset. */ + struct {} end_reset_fields; /* processor features (e.g. for CPUID insn) */ uint32_t cpuid_level;
Instead of using the next field in the struct (that's a moving target because we are gradually moving fields to X86CPU), add an empty struct as a marker (like we already did with {start,end}_init_save). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- target-i386/cpu.c | 2 +- target-i386/cpu.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)