From patchwork Tue Dec 1 12:51:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 39898 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 95D6DB7B63 for ; Tue, 1 Dec 2009 23:55:51 +1100 (EST) Received: from localhost ([127.0.0.1]:41301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFSGi-00065f-GE for incoming@patchwork.ozlabs.org; Tue, 01 Dec 2009 07:55:48 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFSCx-0005VT-M3 for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:55 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFSCs-0005UT-Sp for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:54 -0500 Received: from [199.232.76.173] (port=35005 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFSCs-0005UJ-HR for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41800) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFSCs-0004rR-8f for qemu-devel@nongnu.org; Tue, 01 Dec 2009 07:51:50 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB1CpnHV017331 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 1 Dec 2009 07:51:49 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB1CphNw002534; Tue, 1 Dec 2009 07:51:48 -0500 From: Glauber Costa To: qemu-devel@nongnu.org Date: Tue, 1 Dec 2009 10:51:28 -0200 Message-Id: <1259671897-22232-3-git-send-email-glommer@redhat.com> In-Reply-To: <1259671897-22232-2-git-send-email-glommer@redhat.com> References: <1259671897-22232-1-git-send-email-glommer@redhat.com> <1259671897-22232-2-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com, agraf@suse.de Subject: [Qemu-devel] [PATCH v2 02/11] store thread-specific env information 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 Since we'll have multiple cpu threads, at least for kvm, we need a way to store and retrieve the CPUState associated with the current execution thread. For the I/O thread, this will be NULL. I am using pthread functions for that, for portability, but we could as well use __thread keyword. Signed-off-by: Glauber Costa --- vl.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/vl.c b/vl.c index 44763af..321b18d 100644 --- a/vl.c +++ b/vl.c @@ -3434,6 +3434,24 @@ static void block_io_signals(void); static void unblock_io_signals(void); static int tcg_has_work(void); +static pthread_key_t current_env; + +CPUState *qemu_get_current_env(void); +CPUState *qemu_get_current_env(void) +{ + return pthread_getspecific(current_env); +} + +static void qemu_set_current_env(CPUState *env) +{ + pthread_setspecific(current_env, env); +} + +static void qemu_init_current_env(void) +{ + pthread_key_create(¤t_env, NULL); +} + static int qemu_init_main_loop(void) { int ret; @@ -3446,6 +3464,7 @@ static int qemu_init_main_loop(void) qemu_mutex_init(&qemu_fair_mutex); qemu_mutex_init(&qemu_global_mutex); qemu_mutex_lock(&qemu_global_mutex); + qemu_init_current_env(); unblock_io_signals(); qemu_thread_self(&io_thread); @@ -3484,6 +3503,8 @@ static void *kvm_cpu_thread_fn(void *arg) block_io_signals(); qemu_thread_self(env->thread); + qemu_set_current_env(env); + if (kvm_enabled()) kvm_init_vcpu(env);