From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull4s-0001Ub-Cy for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ull4r-0000vT-7j for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44496 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull4q-0000vM-Tt for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:57 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 9 Jun 2013 21:13:26 +0200 Message-Id: <1370805206-26574-60-git-send-email-afaerber@suse.de> In-Reply-To: <1370805206-26574-1-git-send-email-afaerber@suse.de> References: <1370805206-26574-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] [PATCH qom-cpu 59/59] bsd-user: Change thread_env to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- bsd-user/elfload.c | 6 ++++-- bsd-user/main.c | 6 +++--- bsd-user/qemu.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 5e20510..93fd9e4 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -98,7 +98,7 @@ enum { static const char *get_elf_platform(void) { static char elf_platform[] =3D "i386"; - int family =3D (thread_env->cpuid_version >> 8) & 0xff; + int family =3D object_property_get_int(OBJECT(thread_cpu), "family",= NULL); if (family > 6) family =3D 6; if (family >=3D 3) @@ -110,7 +110,9 @@ static const char *get_elf_platform(void) =20 static uint32_t get_elf_hwcap(void) { - return thread_env->features[FEAT_1_EDX]; + X86CPU *cpu =3D X86_CPU(thread_cpu); + + return cpu->env.features[FEAT_1_EDX]; } =20 #ifdef TARGET_X86_64 diff --git a/bsd-user/main.c b/bsd-user/main.c index b13803e..c2401cc 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -92,7 +92,7 @@ void fork_start(void) void fork_end(int child) { if (child) { - gdbserver_fork(thread_env); + gdbserver_fork((CPUArchState *)thread_cpu->env_ptr); } } =20 @@ -713,7 +713,7 @@ static void usage(void) exit(1); } =20 -THREAD CPUArchState *thread_env; +THREAD CPUState *thread_cpu; =20 /* Assumes contents are already zeroed. */ void init_task_state(TaskState *ts) @@ -915,7 +915,7 @@ int main(int argc, char **argv) #if defined(TARGET_SPARC) || defined(TARGET_PPC) cpu_reset(ENV_GET_CPU(env)); #endif - thread_env =3D env; + thread_cpu =3D ENV_GET_CPU(env); =20 if (getenv("QEMU_STRACE")) { do_strace =3D 1; diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index a826086..325f564 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -139,7 +139,7 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, a= bi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6); void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); -extern THREAD CPUArchState *thread_env; +extern THREAD CPUState *thread_cpu; void cpu_loop(CPUArchState *env); char *target_strerror(int err); int get_osversion(void); --=20 1.8.1.4