haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu: Move thread_kicked to CPUState 

Change field type to bool.

Signed-off-by: Andreas Färber <afaerber@suse.de>
stable-1.2
Andreas Färber 2012-05-02 17:49:49 +02:00
parent 814e612eaf
commit 216fc9a44b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu-defs.h
View File

@ -209,7 +209,6 @@ typedef struct CPUWatchpoint {
uint32_t stop; /* Stop request */ \
uint32_t stopped; /* Artificially stopped */ \
struct QemuCond *halt_cond; \
int thread_kicked; \
struct qemu_work_item *queued_work_first, *queued_work_last; \
const char *cpu_model_str; \
struct KVMState *kvm_state; \

14
cpus.c
View File

@ -686,13 +686,15 @@ static void flush_queued_work(CPUArchState *env)
static void qemu_wait_io_event_common(CPUArchState *env)
{
CPUState *cpu = ENV_GET_CPU(env);
if (env->stop) {
env->stop = 0;
env->stopped = 1;
qemu_cond_signal(&qemu_pause_cond);
}
flush_queued_work(env);
env->thread_kicked = false;
cpu->thread_kicked = false;
}
static void qemu_tcg_wait_io_event(void)
@ -866,11 +868,12 @@ static void qemu_cpu_kick_thread(CPUArchState *env)
void qemu_cpu_kick(void *_env)
{
CPUArchState *env = _env;
CPUState *cpu = ENV_GET_CPU(env);
qemu_cond_broadcast(env->halt_cond);
if (!tcg_enabled() && !env->thread_kicked) {
if (!tcg_enabled() && !cpu->thread_kicked) {
qemu_cpu_kick_thread(env);
env->thread_kicked = true;
cpu->thread_kicked = true;
}
}
@ -878,10 +881,11 @@ void qemu_cpu_kick_self(void)
{
#ifndef _WIN32
assert(cpu_single_env);
CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env);
if (!cpu_single_env->thread_kicked) {
if (!cpu_single_cpu->thread_kicked) {
qemu_cpu_kick_thread(cpu_single_env);
cpu_single_env->thread_kicked = true;
cpu_single_cpu->thread_kicked = true;
}
#else
abort();

1
include/qemu/cpu.h
View File

@ -66,6 +66,7 @@ struct CPUState {
#ifdef _WIN32
HANDLE hThread;
#endif
bool thread_kicked;
/* TODO Move common fields from CPUArchState here. */
};