From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9IVa-000218-KP
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:49:58 -0400
Received: from [140.186.70.92] (port=53024 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9IVX-0001yG-ND
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:49:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mtosatti@redhat.com>) id 1O9IVU-000442-67
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:49:55 -0400
Received: from mx1.redhat.com ([209.132.183.28]:12453)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mtosatti@redhat.com>) id 1O9IVT-00043U-Uw
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:49:52 -0400
Message-Id: <20100504124634.157938055@redhat.com>
Date: Tue, 04 May 2010 09:45:19 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
References: <20100504124518.979470863@redhat.com>
Content-Disposition: inline; filename=cpu-single-env
Subject: [Qemu-devel] [patch uq/master 1/9] kvm: set cpu_single_env around
	KVM_RUN ioctl
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: kvm@vger.kernel.org, qemu-devel@nongnu.org
Cc: Marcelo Tosatti <mtosatti@redhat.com>

Zero cpu_single_env before leaving global lock protection, and
restore on return.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu/kvm-all.c
===================================================================
--- qemu.orig/kvm-all.c
+++ qemu/kvm-all.c
@@ -846,9 +846,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) {