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 <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
diff --git a/kvm-all.c b/kvm-all.c index 6962b2b..fbd084c 100644 --- a/kvm-all.c +++ b/kvm-all.c
@@ -838,9 +838,11 @@ } 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) {