From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1y-0007oc-9m for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Usb1o-0003jt-KI for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44172 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1o-0003if-9O for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:04 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B7583A552F for ; Fri, 28 Jun 2013 17:56:03 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 28 Jun 2013 17:55:43 +0200 Message-Id: <1372434946-18489-22-git-send-email-afaerber@suse.de> In-Reply-To: <1372434946-18489-1-git-send-email-afaerber@suse.de> References: <1372434946-18489-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 21/24] cpus: Change qemu_dummy_start_vcpu() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Pass it to qemu_dummy_cpu_thread_fn(). Use CPUState::env_ptr for cpu_single_env. Prepares for changing qemu_init_vcpu() argument to CPUState. Reviewed-by: Richard Henderson Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cpus.c b/cpus.c index 6e6a8f9..06ab567 100644 --- a/cpus.c +++ b/cpus.c @@ -766,8 +766,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) fprintf(stderr, "qtest is not supported under Windows\n"); exit(1); #else - CPUArchState *env =3D arg; - CPUState *cpu =3D ENV_GET_CPU(env); + CPUState *cpu =3D arg; sigset_t waitset; int r; =20 @@ -782,7 +781,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) cpu->created =3D true; qemu_cond_signal(&qemu_cpu_cond); =20 - cpu_single_env =3D env; + cpu_single_env =3D cpu->env_ptr; while (1) { cpu_single_env =3D NULL; qemu_mutex_unlock_iothread(); @@ -795,7 +794,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) exit(1); } qemu_mutex_lock_iothread(); - cpu_single_env =3D env; + cpu_single_env =3D cpu->env_ptr; qemu_wait_io_event_common(cpu); } =20 @@ -1042,14 +1041,12 @@ static void qemu_kvm_start_vcpu(CPUState *cpu) } } =20 -static void qemu_dummy_start_vcpu(CPUArchState *env) +static void qemu_dummy_start_vcpu(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); - cpu->thread =3D g_malloc0(sizeof(QemuThread)); cpu->halt_cond =3D g_malloc0(sizeof(QemuCond)); qemu_cond_init(cpu->halt_cond); - qemu_thread_create(cpu->thread, qemu_dummy_cpu_thread_fn, env, + qemu_thread_create(cpu->thread, qemu_dummy_cpu_thread_fn, cpu, QEMU_THREAD_JOINABLE); while (!cpu->created) { qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex); @@ -1069,7 +1066,7 @@ void qemu_init_vcpu(void *_env) } else if (tcg_enabled()) { qemu_tcg_init_vcpu(cpu); } else { - qemu_dummy_start_vcpu(env); + qemu_dummy_start_vcpu(cpu); } } =20 --=20 1.8.1.4