mirror of https://github.com/proxmox/mirror_qemu
hw/core/cpu: Check for USER_ONLY definition instead of SOFTMMU one
Since we *might* have user emulation with softmmu, replace the system emulation check by !user emulation one. Invert the #ifdef'ry in TCGCPUOps structure for clarity. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20230613133347.82210-6-philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>master
parent
227776b7e2
commit
75fe97b429
|
@ -1016,7 +1016,7 @@ void page_size_init(void);
|
||||||
|
|
||||||
#ifdef NEED_CPU_H
|
#ifdef NEED_CPU_H
|
||||||
|
|
||||||
#ifdef CONFIG_SOFTMMU
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
|
||||||
extern const VMStateDescription vmstate_cpu_common;
|
extern const VMStateDescription vmstate_cpu_common;
|
||||||
|
|
||||||
|
@ -1027,7 +1027,7 @@ extern const VMStateDescription vmstate_cpu_common;
|
||||||
.flags = VMS_STRUCT, \
|
.flags = VMS_STRUCT, \
|
||||||
.offset = 0, \
|
.offset = 0, \
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SOFTMMU */
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
|
|
||||||
#endif /* NEED_CPU_H */
|
#endif /* NEED_CPU_H */
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,56 @@ struct TCGCPUOps {
|
||||||
*/
|
*/
|
||||||
void (*do_interrupt)(CPUState *cpu);
|
void (*do_interrupt)(CPUState *cpu);
|
||||||
#endif /* !CONFIG_USER_ONLY || !TARGET_I386 */
|
#endif /* !CONFIG_USER_ONLY || !TARGET_I386 */
|
||||||
#ifdef CONFIG_SOFTMMU
|
#ifdef CONFIG_USER_ONLY
|
||||||
|
/**
|
||||||
|
* record_sigsegv:
|
||||||
|
* @cpu: cpu context
|
||||||
|
* @addr: faulting guest address
|
||||||
|
* @access_type: access was read/write/execute
|
||||||
|
* @maperr: true for invalid page, false for permission fault
|
||||||
|
* @ra: host pc for unwinding
|
||||||
|
*
|
||||||
|
* We are about to raise SIGSEGV with si_code set for @maperr,
|
||||||
|
* and si_addr set for @addr. Record anything further needed
|
||||||
|
* for the signal ucontext_t.
|
||||||
|
*
|
||||||
|
* If the emulated kernel does not provide anything to the signal
|
||||||
|
* handler with anything besides the user context registers, and
|
||||||
|
* the siginfo_t, then this hook need do nothing and may be omitted.
|
||||||
|
* Otherwise, record the data and return; the caller will raise
|
||||||
|
* the signal, unwind the cpu state, and return to the main loop.
|
||||||
|
*
|
||||||
|
* If it is simpler to re-use the sysemu tlb_fill code, @ra is provided
|
||||||
|
* so that a "normal" cpu exception can be raised. In this case,
|
||||||
|
* the signal must be raised by the architecture cpu_loop.
|
||||||
|
*/
|
||||||
|
void (*record_sigsegv)(CPUState *cpu, vaddr addr,
|
||||||
|
MMUAccessType access_type,
|
||||||
|
bool maperr, uintptr_t ra);
|
||||||
|
/**
|
||||||
|
* record_sigbus:
|
||||||
|
* @cpu: cpu context
|
||||||
|
* @addr: misaligned guest address
|
||||||
|
* @access_type: access was read/write/execute
|
||||||
|
* @ra: host pc for unwinding
|
||||||
|
*
|
||||||
|
* We are about to raise SIGBUS with si_code BUS_ADRALN,
|
||||||
|
* and si_addr set for @addr. Record anything further needed
|
||||||
|
* for the signal ucontext_t.
|
||||||
|
*
|
||||||
|
* If the emulated kernel does not provide the signal handler with
|
||||||
|
* anything besides the user context registers, and the siginfo_t,
|
||||||
|
* then this hook need do nothing and may be omitted.
|
||||||
|
* Otherwise, record the data and return; the caller will raise
|
||||||
|
* the signal, unwind the cpu state, and return to the main loop.
|
||||||
|
*
|
||||||
|
* If it is simpler to re-use the sysemu do_unaligned_access code,
|
||||||
|
* @ra is provided so that a "normal" cpu exception can be raised.
|
||||||
|
* In this case, the signal must be raised by the architecture cpu_loop.
|
||||||
|
*/
|
||||||
|
void (*record_sigbus)(CPUState *cpu, vaddr addr,
|
||||||
|
MMUAccessType access_type, uintptr_t ra);
|
||||||
|
#else
|
||||||
/** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
|
/** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
|
||||||
bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
|
bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
|
||||||
/**
|
/**
|
||||||
|
@ -121,56 +170,7 @@ struct TCGCPUOps {
|
||||||
*/
|
*/
|
||||||
bool (*io_recompile_replay_branch)(CPUState *cpu,
|
bool (*io_recompile_replay_branch)(CPUState *cpu,
|
||||||
const TranslationBlock *tb);
|
const TranslationBlock *tb);
|
||||||
#else
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
/**
|
|
||||||
* record_sigsegv:
|
|
||||||
* @cpu: cpu context
|
|
||||||
* @addr: faulting guest address
|
|
||||||
* @access_type: access was read/write/execute
|
|
||||||
* @maperr: true for invalid page, false for permission fault
|
|
||||||
* @ra: host pc for unwinding
|
|
||||||
*
|
|
||||||
* We are about to raise SIGSEGV with si_code set for @maperr,
|
|
||||||
* and si_addr set for @addr. Record anything further needed
|
|
||||||
* for the signal ucontext_t.
|
|
||||||
*
|
|
||||||
* If the emulated kernel does not provide anything to the signal
|
|
||||||
* handler with anything besides the user context registers, and
|
|
||||||
* the siginfo_t, then this hook need do nothing and may be omitted.
|
|
||||||
* Otherwise, record the data and return; the caller will raise
|
|
||||||
* the signal, unwind the cpu state, and return to the main loop.
|
|
||||||
*
|
|
||||||
* If it is simpler to re-use the sysemu tlb_fill code, @ra is provided
|
|
||||||
* so that a "normal" cpu exception can be raised. In this case,
|
|
||||||
* the signal must be raised by the architecture cpu_loop.
|
|
||||||
*/
|
|
||||||
void (*record_sigsegv)(CPUState *cpu, vaddr addr,
|
|
||||||
MMUAccessType access_type,
|
|
||||||
bool maperr, uintptr_t ra);
|
|
||||||
/**
|
|
||||||
* record_sigbus:
|
|
||||||
* @cpu: cpu context
|
|
||||||
* @addr: misaligned guest address
|
|
||||||
* @access_type: access was read/write/execute
|
|
||||||
* @ra: host pc for unwinding
|
|
||||||
*
|
|
||||||
* We are about to raise SIGBUS with si_code BUS_ADRALN,
|
|
||||||
* and si_addr set for @addr. Record anything further needed
|
|
||||||
* for the signal ucontext_t.
|
|
||||||
*
|
|
||||||
* If the emulated kernel does not provide the signal handler with
|
|
||||||
* anything besides the user context registers, and the siginfo_t,
|
|
||||||
* then this hook need do nothing and may be omitted.
|
|
||||||
* Otherwise, record the data and return; the caller will raise
|
|
||||||
* the signal, unwind the cpu state, and return to the main loop.
|
|
||||||
*
|
|
||||||
* If it is simpler to re-use the sysemu do_unaligned_access code,
|
|
||||||
* @ra is provided so that a "normal" cpu exception can be raised.
|
|
||||||
* In this case, the signal must be raised by the architecture cpu_loop.
|
|
||||||
*/
|
|
||||||
void (*record_sigbus)(CPUState *cpu, vaddr addr,
|
|
||||||
MMUAccessType access_type, uintptr_t ra);
|
|
||||||
#endif /* CONFIG_SOFTMMU */
|
|
||||||
#endif /* NEED_CPU_H */
|
#endif /* NEED_CPU_H */
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue