[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/24] cpus: Change qemu_dummy_start_vcpu() argument
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 21/24] cpus: Change qemu_dummy_start_vcpu() argument to CPUState |
Date: |
Fri, 28 Jun 2013 17:55:43 +0200 |
Pass it to qemu_dummy_cpu_thread_fn().
Use CPUState::env_ptr for cpu_single_env.
Prepares for changing qemu_init_vcpu() argument to CPUState.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
cpus.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/cpus.c b/cpus.c
index 6e6a8f9..06ab567 100644
--- a/cpus.c
+++ b/cpus.c
@@ -766,8 +766,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
fprintf(stderr, "qtest is not supported under Windows\n");
exit(1);
#else
- CPUArchState *env = arg;
- CPUState *cpu = ENV_GET_CPU(env);
+ CPUState *cpu = arg;
sigset_t waitset;
int r;
@@ -782,7 +781,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
cpu->created = true;
qemu_cond_signal(&qemu_cpu_cond);
- cpu_single_env = env;
+ cpu_single_env = cpu->env_ptr;
while (1) {
cpu_single_env = NULL;
qemu_mutex_unlock_iothread();
@@ -795,7 +794,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
exit(1);
}
qemu_mutex_lock_iothread();
- cpu_single_env = env;
+ cpu_single_env = cpu->env_ptr;
qemu_wait_io_event_common(cpu);
}
@@ -1042,14 +1041,12 @@ static void qemu_kvm_start_vcpu(CPUState *cpu)
}
}
-static void qemu_dummy_start_vcpu(CPUArchState *env)
+static void qemu_dummy_start_vcpu(CPUState *cpu)
{
- CPUState *cpu = ENV_GET_CPU(env);
-
cpu->thread = g_malloc0(sizeof(QemuThread));
cpu->halt_cond = g_malloc0(sizeof(QemuCond));
qemu_cond_init(cpu->halt_cond);
- qemu_thread_create(cpu->thread, qemu_dummy_cpu_thread_fn, env,
+ qemu_thread_create(cpu->thread, qemu_dummy_cpu_thread_fn, cpu,
QEMU_THREAD_JOINABLE);
while (!cpu->created) {
qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);
@@ -1069,7 +1066,7 @@ void qemu_init_vcpu(void *_env)
} else if (tcg_enabled()) {
qemu_tcg_init_vcpu(cpu);
} else {
- qemu_dummy_start_vcpu(env);
+ qemu_dummy_start_vcpu(cpu);
}
}
--
1.8.1.4
- [Qemu-devel] [PULL 09/24] kvm: Change cpu_synchronize_state() argument to CPUState, (continued)
- [Qemu-devel] [PULL 09/24] kvm: Change cpu_synchronize_state() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 02/24] cpu: Introduce device_class_set_vmsd() helper, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 03/24] cpu: Introduce VMSTATE_CPU() macro for CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 10/24] cpu: Change cpu_exit() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 04/24] target-alpha: Register VMStateDescription for AlphaCPU, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 14/24] cpus: Change qemu_kvm_init_cpu_signals() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 16/24] kvm: Change kvm_handle_internal_error() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 18/24] gdbstub: Set gdb_set_stop_cpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 17/24] kvm: Change kvm_cpu_exec() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 19/24] cpus: Change cpu_handle_guest_debug() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 21/24] cpus: Change qemu_dummy_start_vcpu() argument to CPUState,
Andreas Färber <=
- [Qemu-devel] [PULL 20/24] cpus: Change qemu_kvm_start_vcpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 23/24] hwaddr: Make hwaddr type usable beyond softmmu, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 22/24] cpu: Change qemu_init_vcpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 15/24] cpu: Turn cpu_dump_{state, statistics}() into CPUState hooks, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 24/24] cpu: Turn cpu_unassigned_access() into a CPUState hook, Andreas Färber, 2013/06/28