aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2021-04-18 15:22:34 +0200
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>2021-05-02 16:49:35 +0200
commit44e3b05005c6696cd526a4575293513db453f4b5 (patch)
tree97963eab4f4ad9e37c3e46154af1ec30c1d0d6e9
parent8074365fc7ab51c582565f4d77299889e511af5b (diff)
downloadqemu-44e3b05005c6696cd526a4575293513db453f4b5.zip
qemu-44e3b05005c6696cd526a4575293513db453f4b5.tar.gz
qemu-44e3b05005c6696cd526a4575293513db453f4b5.tar.bz2
target/mips: Move cpu_signal_handler definition around
We have 2 blocks guarded with #ifdef for sysemu, which are simply separated by the cpu_signal_handler definition. To simplify the following commits which involve various changes in internal.h, first join the sysemu-guarded blocks. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20210428170410.479308-16-f4bug@amsat.org>
-rw-r--r--target/mips/internal.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/target/mips/internal.h b/target/mips/internal.h
index 754135c..3c8ccfb 100644
--- a/target/mips/internal.h
+++ b/target/mips/internal.h
@@ -151,13 +151,12 @@ void mips_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr,
MemTxResult response, uintptr_t retaddr);
hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address,
MMUAccessType access_type, uintptr_t retaddr);
-#endif
-
-#define cpu_signal_handler cpu_mips_signal_handler
-#ifndef CONFIG_USER_ONLY
extern const VMStateDescription vmstate_mips_cpu;
-#endif
+
+#endif /* !CONFIG_USER_ONLY */
+
+#define cpu_signal_handler cpu_mips_signal_handler
static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env)
{