summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-08-26 03:41:01 +0200
committerAndreas Färber <afaerber@suse.de>2014-03-13 19:20:46 +0100
commit93afeade09680c657e109bf192dbf70233e4ebbe (patch)
treee46da9240df5e131dc8efade6f5a1067df42d51b /hw
parent7510454e3e74aafa2e6c50388bf24904644b6a96 (diff)
downloadqemu-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 'hw')
-rw-r--r--hw/i386/kvmvapic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 72025d0359..6cf5d41155 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -406,7 +406,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
}
if (!kvm_enabled()) {
- cpu_restore_state(env, env->mem_io_pc);
+ cpu_restore_state(env, cs->mem_io_pc);
cpu_get_tb_cpu_state(env, &current_pc, &current_cs_base,
&current_flags);
}