From: Bobby Eshleman <bobby.eshleman@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: "Bobby Eshleman" <bobby.eshleman@gmail.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Julien Grall" <julien@xen.org>,
"Volodymyr Babchuk" <Volodymyr_Babchuk@epam.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Ian Jackson" <iwj@xenproject.org>,
"Jan Beulich" <jbeulich@suse.com>, "Wei Liu" <wl@xen.org>,
"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Jun Nakajima" <jun.nakajima@intel.com>,
"Kevin Tian" <kevin.tian@intel.com>
Subject: [PATCH 4/4] x86/debug: move domain_pause_for_debugger to debugger.c
Date: Mon, 12 Jul 2021 18:59:56 -0700 [thread overview]
Message-ID: <b7b3169d191c3ec86a9cf5267e661aac9c17559b.1626136452.git.bobby.eshleman@gmail.com> (raw)
In-Reply-To: <cover.1626136452.git.bobby.eshleman@gmail.com>
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>
---
xen/arch/x86/debugger.c | 12 ++++++++++++
xen/arch/x86/domain.c | 14 --------------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/xen/arch/x86/debugger.c b/xen/arch/x86/debugger.c
index 6f33f509ff..4f7c44600f 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)
+{
+ 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, struct cpu_user_regs *regs)
{
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 47448f2f8c..545da32c3b 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
--
2.30.0
next prev parent reply other threads:[~2021-07-13 2:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1626136452.git.bobby.eshleman@gmail.com>
2021-07-13 1:59 ` [PATCH 1/4] build: use common stubs for debugger_trap_* functions if !CONFIG_CRASH_DEBUG Bobby Eshleman
2021-07-14 9:34 ` Jan Beulich
2021-07-14 21:03 ` Bob Eshleman
2021-07-15 6:45 ` Jan Beulich
2021-07-13 1:59 ` [PATCH 2/4] arm/traps: remove debugger_trap_fatal() calls Bobby Eshleman
2021-07-13 1:59 ` [PATCH 3/4] x86/debug: move debugger_trap_entry into debugger.c not inlined Bobby Eshleman
2021-07-14 9:52 ` Jan Beulich
2021-07-13 1:59 ` Bobby Eshleman [this message]
2021-07-14 9:55 ` [PATCH 4/4] x86/debug: move domain_pause_for_debugger to debugger.c Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b7b3169d191c3ec86a9cf5267e661aac9c17559b.1626136452.git.bobby.eshleman@gmail.com \
--to=bobby.eshleman@gmail.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=andrew.cooper3@citrix.com \
--cc=elena.ufimtseva@oracle.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=julien@xen.org \
--cc=jun.nakajima@intel.com \
--cc=kevin.tian@intel.com \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).