diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-08-26 03:41:01 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:20:46 +0100 |
| commit | 93afeade09680c657e109bf192dbf70233e4ebbe (patch) | |
| tree | e46da9240df5e131dc8efade6f5a1067df42d51b /target-i386 | |
| parent | 7510454e3e74aafa2e6c50388bf24904644b6a96 (diff) | |
| download | qemu-93afeade09680c657e109bf192dbf70233e4ebbe.tar.gz | |
cpu: Move mem_io_{pc,vaddr} fields from CPU_COMMON to CPUState
Reset them.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/helper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 696bbf55c4..4910e40c17 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1254,13 +1254,14 @@ void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) { X86CPU *cpu = x86_env_get_cpu(env); + CPUState *cs = CPU(cpu); if (kvm_enabled()) { env->tpr_access_type = access; - cpu_interrupt(CPU(cpu), CPU_INTERRUPT_TPR); + cpu_interrupt(cs, CPU_INTERRUPT_TPR); } else { - cpu_restore_state(env, env->mem_io_pc); + cpu_restore_state(env, cs->mem_io_pc); apic_handle_tpr_access_report(cpu->apic_state, env->eip, access); } |