From 44e3b05005c6696cd526a4575293513db453f4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sun, 18 Apr 2021 15:22:34 +0200 Subject: target/mips: Move cpu_signal_handler definition around MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210428170410.479308-16-f4bug@amsat.org> --- target/mips/internal.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 754135c142..3c8ccfbe92 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) { -- cgit v1.2.3