From 60a3e17a469e444a7bc4d9a14c2ecf3bdb5ec094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 17 May 2013 18:26:54 +0200 Subject: [PATCH] cpu: Change cpu_exit() argument to CPUState MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- cpus.c | 4 ++-- exec.c | 8 -------- gdbstub.c | 2 +- hw/i386/pc.c | 2 +- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/ppc/prep.c | 2 +- include/exec/cpu-all.h | 2 -- include/qom/cpu.h | 8 ++++++++ linux-user/main.c | 2 +- linux-user/signal.c | 2 +- qom/cpu.c | 6 ++++++ 13 files changed, 24 insertions(+), 20 deletions(-) diff --git a/cpus.c b/cpus.c index 353208cef22c..cce5223a23f7 100644 --- a/cpus.c +++ b/cpus.c @@ -473,7 +473,7 @@ static void cpu_handle_guest_debug(CPUArchState *env) static void cpu_signal(int sig) { if (cpu_single_env) { - cpu_exit(cpu_single_env); + cpu_exit(ENV_GET_CPU(cpu_single_env)); } exit_request = 1; } @@ -1088,7 +1088,7 @@ void cpu_stop_current(void) CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env); cpu_single_cpu->stop = false; cpu_single_cpu->stopped = true; - cpu_exit(cpu_single_env); + cpu_exit(cpu_single_cpu); qemu_cond_signal(&qemu_pause_cond); } } diff --git a/exec.c b/exec.c index 0b172b45a655..2d02b11e1c4d 100644 --- a/exec.c +++ b/exec.c @@ -598,14 +598,6 @@ void cpu_single_step(CPUArchState *env, int enabled) #endif } -void cpu_exit(CPUArchState *env) -{ - CPUState *cpu = ENV_GET_CPU(env); - - cpu->exit_request = 1; - cpu->tcg_exit_req = 1; -} - void cpu_abort(CPUArchState *env, const char *fmt, ...) { va_list ap; diff --git a/gdbstub.c b/gdbstub.c index 663549cf3358..0f15c7c3443c 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2655,7 +2655,7 @@ void gdb_do_syscall(gdb_syscall_complete_cb cb, const char *fmt, ...) is still in the running state, which can cause packets to be dropped and state transition 'T' packets to be sent while the syscall is still being processed. */ - cpu_exit(s->c_cpu); + cpu_exit(ENV_GET_CPU(s->c_cpu)); #endif } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5e8f143bc2b3..78f92e29a778 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1109,7 +1109,7 @@ static void cpu_request_exit(void *opaque, int irq, int level) CPUX86State *env = cpu_single_env; if (env && level) { - cpu_exit(env); + cpu_exit(CPU(x86_env_get_cpu(env))); } } diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 1aac93a414bc..00c9071af1d8 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -253,7 +253,7 @@ static void cpu_request_exit(void *opaque, int irq, int level) CPUMIPSState *env = cpu_single_env; if (env && level) { - cpu_exit(env); + cpu_exit(CPU(mips_env_get_cpu(env))); } } diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 94d95702a4ed..2ad0c0b4147a 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -102,7 +102,7 @@ static void cpu_request_exit(void *opaque, int irq, int level) CPUMIPSState *env = cpu_single_env; if (env && level) { - cpu_exit(env); + cpu_exit(CPU(mips_env_get_cpu(env))); } } diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 5033d51224cd..8a4459d0b2bd 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -773,7 +773,7 @@ static void cpu_request_exit(void *opaque, int irq, int level) CPUMIPSState *env = cpu_single_env; if (env && level) { - cpu_exit(env); + cpu_exit(CPU(mips_env_get_cpu(env))); } } diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 4fdc1649fd32..90828f263584 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -420,7 +420,7 @@ static void cpu_request_exit(void *opaque, int irq, int level) CPUPPCState *env = cpu_single_env; if (env && level) { - cpu_exit(env); + cpu_exit(CPU(ppc_env_get_cpu(env))); } } diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e9c37178639b..e1cc62ef5ea1 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -421,8 +421,6 @@ DECLARE_TLS(CPUArchState *,cpu_single_env); | CPU_INTERRUPT_TGT_EXT_3 \ | CPU_INTERRUPT_TGT_EXT_4) -void cpu_exit(CPUArchState *s); - /* Breakpoint/watchpoint flags */ #define BP_MEM_READ 0x01 #define BP_MEM_WRITE 0x02 diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 3e8cc479bd43..3494356d67f8 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -370,6 +370,14 @@ void cpu_interrupt(CPUState *cpu, int mask); */ void cpu_reset_interrupt(CPUState *cpu, int mask); +/** + * cpu_exit: + * @cpu: The CPU to exit. + * + * Requests the CPU @cpu to exit execution. + */ +void cpu_exit(CPUState *cpu); + /** * cpu_resume: * @cpu: The CPU to resume. diff --git a/linux-user/main.c b/linux-user/main.c index 21725a4971a3..f67a62b18823 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 5da8452b2a16..c4e20dc8b9c7 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)); } } diff --git a/qom/cpu.c b/qom/cpu.c index dba4a11edc02..8a122b0ea97d 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -91,6 +91,12 @@ void cpu_reset_interrupt(CPUState *cpu, int mask) cpu->interrupt_request &= ~mask; } +void cpu_exit(CPUState *cpu) +{ + cpu->exit_request = 1; + cpu->tcg_exit_req = 1; +} + int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu, void *opaque) {