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

cpus: Pass CPUState to cpu_is_stopped()

Browse Source 
CPUArchState is no longer needed there.

Also change the return type to bool.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-05-02 23:38:39 +02:00
parent f324e7667a
commit 2fa45344a9
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu-all.h
View File

@ -466,7 +466,6 @@ void cpu_watchpoint_remove_all(CPUArchState *env, int mask);
#define SSTEP_NOTIMER 0x4 /* Do not Timers while single stepping */ #define SSTEP_NOTIMER 0x4 /* Do not Timers while single stepping */
void cpu_single_step(CPUArchState *env, int enabled); void cpu_single_step(CPUArchState *env, int enabled);
int cpu_is_stopped(CPUArchState *env);
void run_on_cpu(CPUArchState *env, void (*func)(void *data), void *data); void run_on_cpu(CPUArchState *env, void (*func)(void *data), void *data);
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)

4
cpus.c
View File

@ -430,10 +430,8 @@ void cpu_synchronize_all_post_init(void)
} }
} }
int cpu_is_stopped(CPUArchState *env) bool cpu_is_stopped(CPUState *cpu)
{ {
CPUState *cpu = ENV_GET_CPU(env);
return !runstate_is_running() || cpu->stopped; return !runstate_is_running() || cpu->stopped;
} }

11
include/qemu/cpu.h
View File

@ -94,5 +94,16 @@ void cpu_reset(CPUState *cpu);
*/ */
bool qemu_cpu_is_self(CPUState *cpu); bool qemu_cpu_is_self(CPUState *cpu);
/**
* cpu_is_stopped:
* @cpu: The CPU to check.
*
* Checks whether the CPU is stopped.
*
* Returns: %true if run state is not running or if artificially stopped;
* %false otherwise.
*/
bool cpu_is_stopped(CPUState *cpu);
#endif #endif

4
target-i386/kvm.c
View File

@ -1555,7 +1555,7 @@ int kvm_arch_put_registers(CPUX86State *env, int level)
CPUState *cpu = ENV_GET_CPU(env); CPUState *cpu = ENV_GET_CPU(env);
int ret; int ret;
assert(cpu_is_stopped(env) || qemu_cpu_is_self(cpu)); assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu));
ret = kvm_getput_regs(env, 1); ret = kvm_getput_regs(env, 1);
if (ret < 0) { if (ret < 0) {
@ -1613,7 +1613,7 @@ int kvm_arch_get_registers(CPUX86State *env)
CPUState *cpu = ENV_GET_CPU(env); CPUState *cpu = ENV_GET_CPU(env);
int ret; int ret;
assert(cpu_is_stopped(env) || qemu_cpu_is_self(cpu)); assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu));
ret = kvm_getput_regs(env, 0); ret = kvm_getput_regs(env, 0);
if (ret < 0) { if (ret < 0) {