falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cpus: Pass CPUState to qemu_cpu_kick_thread() 

CPUArchState is no longer needed there.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
Andreas Färber 2012-05-03 00:23:30 +02:00
parent 60e82579c7
commit 2ff09a40a8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpus.c
View File

@ -844,9 +844,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
return NULL; return NULL;
} }
static void qemu_cpu_kick_thread(CPUArchState *env) static void qemu_cpu_kick_thread(CPUState *cpu)
{ {
CPUState *cpu = ENV_GET_CPU(env);
#ifndef _WIN32 #ifndef _WIN32
int err; int err;
@ -871,7 +870,7 @@ void qemu_cpu_kick(void *_env)
qemu_cond_broadcast(env->halt_cond); qemu_cond_broadcast(env->halt_cond);
if (!tcg_enabled() && !cpu->thread_kicked) { if (!tcg_enabled() && !cpu->thread_kicked) {
qemu_cpu_kick_thread(env); qemu_cpu_kick_thread(cpu);
cpu->thread_kicked = true; cpu->thread_kicked = true;
} }
} }
@ -883,7 +882,7 @@ void qemu_cpu_kick_self(void)
CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env); CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env);
if (!cpu_single_cpu->thread_kicked) { if (!cpu_single_cpu->thread_kicked) {
qemu_cpu_kick_thread(cpu_single_env); qemu_cpu_kick_thread(cpu_single_cpu);
cpu_single_cpu->thread_kicked = true; cpu_single_cpu->thread_kicked = true;
} }
#else #else
@ -908,7 +907,7 @@ void qemu_mutex_lock_iothread(void)
} else { } else {
iothread_requesting_mutex = true; iothread_requesting_mutex = true;
if (qemu_mutex_trylock(&qemu_global_mutex)) { if (qemu_mutex_trylock(&qemu_global_mutex)) {
qemu_cpu_kick_thread(first_cpu); qemu_cpu_kick_thread(ENV_GET_CPU(first_cpu));
qemu_mutex_lock(&qemu_global_mutex); qemu_mutex_lock(&qemu_global_mutex);
} }
iothread_requesting_mutex = false; iothread_requesting_mutex = false;