summaryrefslogtreecommitdiffstats
path: root/target-i386
diff options
context:
space:
mode:
authorGleb Natapov2012-02-16 10:12:51 +0100
committerAvi Kivity2012-02-16 17:21:46 +0100
commitd1f866366070d09ff5c467efb0a64ac582e3aa5d (patch)
treeeb0d96b918f5fd75f940c358034ba53be594c8e3 /target-i386
parentMerge remote-tracking branch 'qemu-kvm/uq/master' into staging (diff)
downloadqemu-d1f866366070d09ff5c467efb0a64ac582e3aa5d.tar.gz
qemu-d1f866366070d09ff5c467efb0a64ac582e3aa5d.tar.xz
qemu-d1f866366070d09ff5c467efb0a64ac582e3aa5d.zip
kvm: Synchronize cpu state in kvm_arch_stop_on_emulation_error()
Call to kvm_cpu_synchronize_state() is missing. kvm_arch_stop_on_emulation_error may look at outdated registers here. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/kvm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 981192ddf8..0e0b63bb3e 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1987,6 +1987,7 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run)
bool kvm_arch_stop_on_emulation_error(CPUState *env)
{
+ kvm_cpu_synchronize_state(env);
return !(env->cr[0] & CR0_PE_MASK) ||
((env->segs[R_CS].selector & 3) != 3);
}