From 273faf1b6dbdedd0fe9fc519ec73380eced667c2 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Tue, 4 May 2010 09:45:19 -0300 Subject: kvm: set cpu_single_env around KVM_RUN ioctl Zero cpu_single_env before leaving global lock protection, and restore on return. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity --- kvm-all.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'kvm-all.c') diff --git a/kvm-all.c b/kvm-all.c index 6962b2bbe8..fbd084cd6a 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -838,9 +838,11 @@ int kvm_cpu_exec(CPUState *env) } kvm_arch_pre_run(env, run); + cpu_single_env = NULL; qemu_mutex_unlock_iothread(); ret = kvm_vcpu_ioctl(env, KVM_RUN, 0); qemu_mutex_lock_iothread(); + cpu_single_env = env; kvm_arch_post_run(env, run); if (ret == -EINTR || ret == -EAGAIN) { -- cgit v1.2.1