From 60a3e17a469e444a7bc4d9a14c2ecf3bdb5ec094 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Fri, 17 May 2013 18:26:54 +0200 Subject: cpu: Change cpu_exit() argument to CPUState It no longer depends on CPUArchState, so move it to qom/cpu.c. Prepares for changing GDBState::c_cpu to CPUState. Signed-off-by: Andreas Färber --- linux-user/main.c | 2 +- linux-user/signal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user') diff --git a/linux-user/main.c b/linux-user/main.c index 21725a4971..f67a62b188 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -160,7 +160,7 @@ static inline void start_exclusive(void) other_cpu = ENV_GET_CPU(other); if (other_cpu->running) { pending_cpus++; - cpu_exit(other); + cpu_exit(other_cpu); } } if (pending_cpus > 1) { diff --git a/linux-user/signal.c b/linux-user/signal.c index 5da8452b2a..c4e20dc8b9 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -524,7 +524,7 @@ static void host_signal_handler(int host_signum, siginfo_t *info, host_to_target_siginfo_noswap(&tinfo, info); if (queue_signal(thread_env, sig, &tinfo) == 1) { /* interrupt the virtual CPU as soon as possible */ - cpu_exit(thread_env); + cpu_exit(ENV_GET_CPU(thread_env)); } } -- cgit v1.2.3-55-g7522