OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cpu: Move stop field to CPUState

Browse Source 
Change its type to bool.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-05-02 23:10:09 +02:00
parent 61a4621784
commit 4fdeee7cd4
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu-defs.h
View File

@ -205,7 +205,6 @@ typedef struct CPUWatchpoint {
/* user data */ \ /* user data */ \
void *opaque; \ void *opaque; \
\ \
uint32_t stop; /* Stop request */ \
uint32_t stopped; /* Artificially stopped */ \ uint32_t stopped; /* Artificially stopped */ \
struct QemuCond *halt_cond; \ struct QemuCond *halt_cond; \
struct qemu_work_item *queued_work_first, *queued_work_last; \ struct qemu_work_item *queued_work_first, *queued_work_last; \

27
cpus.c
View File

@ -64,7 +64,9 @@ static CPUArchState *next_cpu;
static bool cpu_thread_is_idle(CPUArchState *env) static bool cpu_thread_is_idle(CPUArchState *env)
{ {
if (env->stop || env->queued_work_first) { CPUState *cpu = ENV_GET_CPU(env);
if (cpu->stop || env->queued_work_first) {
return false; return false;
} }
if (env->stopped || !runstate_is_running()) { if (env->stopped || !runstate_is_running()) {
@ -448,7 +450,9 @@ static void do_vm_stop(RunState state)
static int cpu_can_run(CPUArchState *env) static int cpu_can_run(CPUArchState *env)
{ {
if (env->stop) { CPUState *cpu = ENV_GET_CPU(env);
if (cpu->stop) {
return 0; return 0;
} }
if (env->stopped || !runstate_is_running()) { if (env->stopped || !runstate_is_running()) {
@ -687,8 +691,8 @@ static void qemu_wait_io_event_common(CPUArchState *env)
{ {
CPUState *cpu = ENV_GET_CPU(env); CPUState *cpu = ENV_GET_CPU(env);
if (env->stop) { if (cpu->stop) {
env->stop = 0; cpu->stop = false;
env->stopped = 1; env->stopped = 1;
qemu_cond_signal(&qemu_pause_cond); qemu_cond_signal(&qemu_pause_cond);
} }
@ -941,7 +945,8 @@ void pause_all_vcpus(void)
qemu_clock_enable(vm_clock, false); qemu_clock_enable(vm_clock, false);
while (penv) { while (penv) {
penv->stop = 1; CPUState *pcpu = ENV_GET_CPU(penv);
pcpu->stop = true;
qemu_cpu_kick(penv); qemu_cpu_kick(penv);
penv = penv->next_cpu; penv = penv->next_cpu;
} }
@ -950,7 +955,8 @@ void pause_all_vcpus(void)
cpu_stop_current(); cpu_stop_current();
if (!kvm_enabled()) { if (!kvm_enabled()) {
while (penv) { while (penv) {
penv->stop = 0; CPUState *pcpu = ENV_GET_CPU(penv);
pcpu->stop = 0;
penv->stopped = 1; penv->stopped = 1;
penv = penv->next_cpu; penv = penv->next_cpu;
} }
@ -974,7 +980,8 @@ void resume_all_vcpus(void)
qemu_clock_enable(vm_clock, true); qemu_clock_enable(vm_clock, true);
while (penv) { while (penv) {
penv->stop = 0; CPUState *pcpu = ENV_GET_CPU(penv);
pcpu->stop = false;
penv->stopped = 0; penv->stopped = 0;
qemu_cpu_kick(penv); qemu_cpu_kick(penv);
penv = penv->next_cpu; penv = penv->next_cpu;
@ -1054,7 +1061,8 @@ void qemu_init_vcpu(void *_env)
void cpu_stop_current(void) void cpu_stop_current(void)
{ {
if (cpu_single_env) { if (cpu_single_env) {
cpu_single_env->stop = 0; CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env);
cpu_single_cpu->stop = false;
cpu_single_env->stopped = 1; cpu_single_env->stopped = 1;
cpu_exit(cpu_single_env); cpu_exit(cpu_single_env);
qemu_cond_signal(&qemu_pause_cond); qemu_cond_signal(&qemu_pause_cond);
@ -1136,6 +1144,7 @@ static void tcg_exec_all(void)
} }
for (; next_cpu != NULL && !exit_request; next_cpu = next_cpu->next_cpu) { for (; next_cpu != NULL && !exit_request; next_cpu = next_cpu->next_cpu) {
CPUArchState *env = next_cpu; CPUArchState *env = next_cpu;
CPUState *cpu = ENV_GET_CPU(env);
qemu_clock_enable(vm_clock, qemu_clock_enable(vm_clock,
(env->singlestep_enabled & SSTEP_NOTIMER) == 0); (env->singlestep_enabled & SSTEP_NOTIMER) == 0);
@ -1146,7 +1155,7 @@ static void tcg_exec_all(void)
cpu_handle_guest_debug(env); cpu_handle_guest_debug(env);
break; break;
} }
} else if (env->stop || env->stopped) { } else if (cpu->stop || env->stopped) {
break; break;
} }
} }

2
include/qemu/cpu.h
View File

@ -55,6 +55,7 @@ typedef struct CPUClass {
/** /**
* CPUState: * CPUState:
* @created: Indicates whether the CPU thread has been successfully created. * @created: Indicates whether the CPU thread has been successfully created.
* @stop: Indicates a pending stop request.
* *
* State of one CPU core or thread. * State of one CPU core or thread.
*/ */
@ -69,6 +70,7 @@ struct CPUState {
#endif #endif
bool thread_kicked; bool thread_kicked;
bool created; bool created;
bool stop;
/* TODO Move common fields from CPUArchState here. */ /* TODO Move common fields from CPUArchState here. */
}; };