mirror of
https://github.com/qemu/qemu.git
synced 2025-01-21 04:53:26 +08:00
cpus: Pass CPUState to qemu_wait_io_event_common()
CPUArchState is no longer needed there. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
6d45b109a6
commit
509a0d78c7
12
cpus.c
12
cpus.c
@ -687,10 +687,8 @@ static void flush_queued_work(CPUState *cpu)
|
||||
qemu_cond_broadcast(&qemu_work_cond);
|
||||
}
|
||||
|
||||
static void qemu_wait_io_event_common(CPUArchState *env)
|
||||
static void qemu_wait_io_event_common(CPUState *cpu)
|
||||
{
|
||||
CPUState *cpu = ENV_GET_CPU(env);
|
||||
|
||||
if (cpu->stop) {
|
||||
cpu->stop = false;
|
||||
cpu->stopped = true;
|
||||
@ -716,7 +714,7 @@ static void qemu_tcg_wait_io_event(void)
|
||||
}
|
||||
|
||||
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
||||
qemu_wait_io_event_common(env);
|
||||
qemu_wait_io_event_common(ENV_GET_CPU(env));
|
||||
}
|
||||
}
|
||||
|
||||
@ -729,7 +727,7 @@ static void qemu_kvm_wait_io_event(CPUArchState *env)
|
||||
}
|
||||
|
||||
qemu_kvm_eat_signals(env);
|
||||
qemu_wait_io_event_common(env);
|
||||
qemu_wait_io_event_common(cpu);
|
||||
}
|
||||
|
||||
static void *qemu_kvm_cpu_thread_fn(void *arg)
|
||||
@ -804,7 +802,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
|
||||
}
|
||||
qemu_mutex_lock_iothread();
|
||||
cpu_single_env = env;
|
||||
qemu_wait_io_event_common(env);
|
||||
qemu_wait_io_event_common(cpu);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@ -836,7 +834,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
|
||||
|
||||
/* process any pending work */
|
||||
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
||||
qemu_wait_io_event_common(env);
|
||||
qemu_wait_io_event_common(ENV_GET_CPU(env));
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user