| Message ID | d3e88e2cb3c850085e7d1061d6b20f7e0acf3887.1626286772.git.bobby.eshleman@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Remove unconditional arch dependency on asm/debugger.h | expand |
On 14.07.2021 22:37, Bobby Eshleman wrote: > The function domain_pause_for_debugger() is conditionally compiled if > CONFIG_CRASH_DEBUG=y. Instead of placing an extra #ifdef inside > domain.c, this commit moves domain_pause_for_debugger() into > x86/debugger.c which is only built by Kbuild given CONFIG_CRASH_DEBUG=y. > > Signed-off-by: Bobby Eshleman <bobby.eshleman@gmail.com> I already gave Acked-by: Jan Beulich <jbeulich@suse.com> on this patch. Please accumulate tags as you send new versions, unless changes you make require you to drop them (and require them to be re- offered after re-review). Jan
diff --git a/xen/arch/x86/debugger.c b/xen/arch/x86/debugger.c index 985c1275b4..54e81b99f4 100644 --- a/xen/arch/x86/debugger.c +++ b/xen/arch/x86/debugger.c @@ -15,6 +15,18 @@ #include <xen/event.h> #include <xen/sched.h> +void domain_pause_for_debugger(void) +{ + const struct vcpu *curr = current; + struct domain *d = curr->domain; + + domain_pause_by_systemcontroller_nosync(d); + + /* if gdbsx active, we just need to pause the domain */ + if ( curr->arch.gdbsx_vcpu_event == 0 ) + send_global_virq(VIRQ_DEBUGGER); +} + bool debugger_trap_entry( unsigned int vector, const struct cpu_user_regs *regs) { diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5b948ff270..450b2ca831 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2540,20 +2540,6 @@ static int __init init_vcpu_kick_softirq(void) } __initcall(init_vcpu_kick_softirq); -#ifdef CONFIG_CRASH_DEBUG -void domain_pause_for_debugger(void) -{ - struct vcpu *curr = current; - struct domain *d = curr->domain; - - domain_pause_by_systemcontroller_nosync(d); - - /* if gdbsx active, we just need to pause the domain */ - if ( curr->arch.gdbsx_vcpu_event == 0 ) - send_global_virq(VIRQ_DEBUGGER); -} -#endif - /* * Local variables: * mode: C
The function domain_pause_for_debugger() is conditionally compiled if CONFIG_CRASH_DEBUG=y. Instead of placing an extra #ifdef inside domain.c, this commit moves domain_pause_for_debugger() into x86/debugger.c which is only built by Kbuild given CONFIG_CRASH_DEBUG=y. Signed-off-by: Bobby Eshleman <bobby.eshleman@gmail.com> --- Changes in v2: - constify struct vcpu *curr xen/arch/x86/debugger.c | 12 ++++++++++++ xen/arch/x86/domain.c | 14 -------------- 2 files changed, 12 insertions(+), 14 deletions(-)