motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target-s390x: Pass S390CPU to s390_{add, del}_running_cpu()

Browse source 
This prepares for moving the halted field to CPUState.
Most call sites can already supply S390CPU, for some env becomes unused.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Färber 2013-01-30 12:48:25 +00:00 • committed by Alexander Graf
parent f94667336e
commit 49e158785f
6 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/s390x/ipl.c
View file

@ -58,10 +58,12 @@ typedef struct S390IPLState {
static void s390_ipl_cpu(uint64_t pswaddr)
{
CPUS390XState *env = &S390_CPU(qemu_get_cpu(0))->env;
S390CPU *cpu = S390_CPU(qemu_get_cpu(0));
CPUS390XState *env = &cpu->env;
env->psw.addr = pswaddr;
env->psw.mask = IPL_PSW_MASK;
s390_add_running_cpu(env);
s390_add_running_cpu(cpu);
}
static int s390_ipl_init(SysBusDevice *dev)

8
hw/s390x/s390-virtio.c
View file

@ -130,8 +130,10 @@ static void s390_virtio_register_hcalls(void)
*/
static unsigned s390_running_cpus;
void s390_add_running_cpu(CPUS390XState *env)
void s390_add_running_cpu(S390CPU *cpu)
{
CPUS390XState *env = &cpu->env;
if (env->halted) {
s390_running_cpus++;
env->halted = 0;
@ -139,8 +141,10 @@ void s390_add_running_cpu(CPUS390XState *env)
}
}
unsigned s390_del_running_cpu(CPUS390XState *env)
unsigned s390_del_running_cpu(S390CPU *cpu)
{
CPUS390XState *env = &cpu->env;
if (env->halted == 0) {
assert(s390_running_cpus >= 1);
s390_running_cpus--;