Merge commit 'e82bcec25f19846bfb899d55c9fb5915516b378a' into upstream-merge

* commit 'e82bcec25f19846bfb899d55c9fb5915516b378a':
  port qemu-kvm's on_vcpu code
  standardize on qemu_cpu_kick for signalling cpu thread(s)
  make SIG_IPI to tcg vcpu thread reliable
  kvm: set cpu_single_env around KVM_RUN ioctl
  Fix -mem-path with hugetlbfs
  doc: Clean up monitor command function index
  doc: Heading for monitor command cpu got lost, restore it
  doc: Fix acl monitor command documentation
  doc: Fix host forwarding monitor command documentation
  lsi: Handle removal of selected devices
  lsi: Adjust some register reset values
  lsi: Purge message queue on reset
  scsi-disk: Clear aiocb on read completion
  SCSI: Add disk reset handler
  iov: Move from hw/ to topdir
  vnc: set the right prefered encoding
  sparc: Fix lazy flag calculation on interrupts, refactor
  sparc: lazy C flag calculation

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/kvm-all.c b/kvm-all.c
index 9ac35aa62..8ae859280 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -857,9 +857,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) {