Commit 2fa45344 authored by Andreas Färber's avatar Andreas Färber
Browse files

cpus: Pass CPUState to cpu_is_stopped() 



CPUArchState is no longer needed there.

Also change the return type to bool.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f324e766

cpu-all.h

+0 −1
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ void cpu_watchpoint_remove_all(CPUArchState *env, int mask); 
#define SSTEP_NOTIMER 0x4  /* Do not Timers while single stepping */



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);



#if !defined(CONFIG_USER_ONLY)

cpus.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}

include/qemu/cpu.h

+11 −0
Original line number Diff line number Diff line
@@ -94,5 +94,16 @@ void cpu_reset(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

target-i386/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ int kvm_arch_put_registers(CPUX86State *env, int level) 
    CPUState *cpu = ENV_GET_CPU(env);

    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);

    if (ret < 0) {
@@ -1613,7 +1613,7 @@ int kvm_arch_get_registers(CPUX86State *env) 
    CPUState *cpu = ENV_GET_CPU(env);

    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);

    if (ret < 0) {