mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
cpus: Pass CPUState to qemu_cpu_kick()
CPUArchState is no longer needed there. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
d5a6814697
commit
c08d7424d6
12 changed files with 26 additions and 20 deletions
4
hw/ppc.c
4
hw/ppc.c
|
@ -206,7 +206,7 @@ static void ppc970_set_irq(void *opaque, int pin, int level)
|
|||
} else {
|
||||
LOG_IRQ("%s: restart the CPU\n", __func__);
|
||||
env->halted = 0;
|
||||
qemu_cpu_kick(env);
|
||||
qemu_cpu_kick(CPU(cpu));
|
||||
}
|
||||
break;
|
||||
case PPC970_INPUT_HRESET:
|
||||
|
@ -335,7 +335,7 @@ static void ppc40x_set_irq(void *opaque, int pin, int level)
|
|||
} else {
|
||||
LOG_IRQ("%s: restart the CPU\n", __func__);
|
||||
env->halted = 0;
|
||||
qemu_cpu_kick(env);
|
||||
qemu_cpu_kick(CPU(cpu));
|
||||
}
|
||||
break;
|
||||
case PPC40x_INPUT_DEBUG:
|
||||
|
|
|
@ -115,7 +115,7 @@ static void spin_kick(void *data)
|
|||
env->halted = 0;
|
||||
env->exception_index = -1;
|
||||
cpu->stopped = false;
|
||||
qemu_cpu_kick(env);
|
||||
qemu_cpu_kick(cpu);
|
||||
}
|
||||
|
||||
static void spin_write(void *opaque, hwaddr addr, uint64_t value,
|
||||
|
|
|
@ -163,6 +163,7 @@ static void rtas_start_cpu(sPAPREnvironment *spapr,
|
|||
uint32_t nret, target_ulong rets)
|
||||
{
|
||||
target_ulong id, start, r3;
|
||||
CPUState *cpu;
|
||||
CPUPPCState *env;
|
||||
|
||||
if (nargs != 3 || nret != 1) {
|
||||
|
@ -175,6 +176,8 @@ static void rtas_start_cpu(sPAPREnvironment *spapr,
|
|||
r3 = rtas_ld(args, 2);
|
||||
|
||||
for (env = first_cpu; env; env = env->next_cpu) {
|
||||
cpu = ENV_GET_CPU(env);
|
||||
|
||||
if (env->cpu_index != id) {
|
||||
continue;
|
||||
}
|
||||
|
@ -194,7 +197,7 @@ static void rtas_start_cpu(sPAPREnvironment *spapr,
|
|||
env->gpr[3] = r3;
|
||||
env->halted = 0;
|
||||
|
||||
qemu_cpu_kick(env);
|
||||
qemu_cpu_kick(cpu);
|
||||
|
||||
rtas_st(rets, 0, 0);
|
||||
return;
|
||||
|
|
|
@ -259,7 +259,7 @@ static void cpu_kick_irq(SPARCCPU *cpu)
|
|||
|
||||
env->halted = 0;
|
||||
cpu_check_irqs(env);
|
||||
qemu_cpu_kick(env);
|
||||
qemu_cpu_kick(CPU(cpu));
|
||||
}
|
||||
|
||||
static void cpu_set_irq(void *opaque, int irq, int level)
|
||||
|
|
|
@ -317,7 +317,7 @@ static void cpu_kick_irq(SPARCCPU *cpu)
|
|||
|
||||
env->halted = 0;
|
||||
cpu_check_irqs(env);
|
||||
qemu_cpu_kick(env);
|
||||
qemu_cpu_kick(CPU(cpu));
|
||||
}
|
||||
|
||||
static void cpu_set_ivec_irq(void *opaque, int irq, int level)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue