[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/43] bsd-user: Change thread_env to CPUState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 11/43] bsd-user: Change thread_env to CPUState |
Date: |
Wed, 10 Jul 2013 16:33:48 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
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[] = "i386";
- int family = (thread_env->cpuid_version >> 8) & 0xff;
+ int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL);
if (family > 6)
family = 6;
if (family >= 3)
@@ -110,7 +110,9 @@ static const char *get_elf_platform(void)
static uint32_t get_elf_hwcap(void)
{
- return thread_env->features[FEAT_1_EDX];
+ X86CPU *cpu = X86_CPU(thread_cpu);
+
+ return cpu->env.features[FEAT_1_EDX];
}
#ifdef TARGET_X86_64
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 75dbd7f..1e92552 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);
}
}
@@ -713,7 +713,7 @@ static void usage(void)
exit(1);
}
-THREAD CPUArchState *thread_env;
+THREAD CPUState *thread_cpu;
/* 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 = env;
+ thread_cpu = ENV_GET_CPU(env);
if (getenv("QEMU_STRACE")) {
do_strace = 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,
abi_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);
--
1.8.1.4
- [Qemu-devel] [PULL 00/43] QOM CPUState patch queue 2013-07-10, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 01/43] target-openrisc: Fix typename in openrisc_cpu_class_by_name(), Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 02/43] Revert "gdbstub: Simplify find_cpu()", Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 05/43] kvm: Free current_cpu identifier, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 07/43] kvm: Change kvm_remove_all_breakpoints() argument to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 04/43] cpu: Drop unnecessary dynamic casts in *_env_get_cpu(), Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 08/43] linux-user: Clean up do_syscall() Coding Style for TARGET_NR_exit, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 11/43] bsd-user: Change thread_env to CPUState,
Andreas Färber <=
- [Qemu-devel] [PULL 15/43] target-ppc: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 16/43] target-s390x: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 12/43] intc/arm_gic: Build arm_gic only once, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 14/43] timer/arm_mptimer: Build arm_mptimer only once, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 18/43] target-i386: Don't overuse CPUArchState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 20/43] target-lm32: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 06/43] cpu: Replace cpu_single_env with CPUState current_cpu, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 17/43] target-s390x: Change handle_{hypercall, diag}() argument to S390CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 22/43] target-moxie: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 03/43] linux-user: Move cpu_clone_regs() and cpu_set_tls() into linux-user, Andreas Färber, 2013/07/10