From patchwork Tue May 4 12:45:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 51608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A7C40B7D2D for ; Tue, 4 May 2010 23:59:39 +1000 (EST) Received: from localhost ([127.0.0.1]:47858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9Iao-00060x-Kx for incoming@patchwork.ozlabs.org; Tue, 04 May 2010 09:55:22 -0400 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 ) 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 ) id 1O9IVT-00043U-Uw for qemu-devel@nongnu.org; Tue, 04 May 2010 09:49:52 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o44DnoxH017342 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 4 May 2010 09:49:50 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o44DbLme000317; Tue, 4 May 2010 09:49:49 -0400 Received: from amt.cnet (vpn2-10-150.ams2.redhat.com [10.36.10.150]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o44CwS7H023283; Tue, 4 May 2010 09:00:13 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id A9D8E68A98C; Tue, 4 May 2010 09:54:50 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o44Csmv3016557; Tue, 4 May 2010 09:54:48 -0300 Message-Id: <20100504124634.157938055@redhat.com> User-Agent: quilt/0.47-1 Date: Tue, 04 May 2010 09:45:19 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org, qemu-devel@nongnu.org References: <20100504124518.979470863@redhat.com> Content-Disposition: inline; filename=cpu-single-env X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Marcelo Tosatti Subject: [Qemu-devel] [patch uq/master 1/9] kvm: set cpu_single_env around KVM_RUN ioctl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Zero cpu_single_env before leaving global lock protection, and restore on return. Signed-off-by: Marcelo Tosatti 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) {