Use the Kconfig generated CONFIG_HAS_GDBSX defines in the code base.
CC: Keir Fraser <k...@xen.org>
CC: Jan Beulich <jbeul...@suse.com>
CC: Andrew Cooper <andrew.coop...@citrix.com>
Signed-off-by: Doug Goldstein <car...@cardoe.com>
---
xen/Rules.mk | 1 -
xen/arch/x86/Rules.mk | 1 -
xen/common/Kconfig | 4 ++++
xen/common/domain.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/xen/Rules.mk b/xen/Rules.mk
index 351a186..0ff1a5d 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -56,7 +56,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG
CFLAGS-$(perfc) += -DPERF_COUNTERS
CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS
CFLAGS-$(lock_profile) += -DLOCK_PROFILE
-CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX
CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS
CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING
CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 367c61e..aacb914 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -3,7 +3,6 @@
HAS_EHCI := y
HAS_KEXEC := y
-HAS_GDBSX := y
HAS_PDX := y
HAS_CORE_PARKING := y
xenoprof := y
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 53ca33f..f63284d 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -5,4 +5,8 @@ menu "Common Features"
config HAS_DEVICE_TREE
bool
+# Select HAS_GDBSX if GDBSX is supported
+config HAS_GDBSX
+ bool
+
endmenu
diff --git a/xen/common/domain.c b/xen/common/domain.c
index f56b7ff..94cb2cc 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -772,7 +772,7 @@ void vcpu_end_shutdown_deferral(struct vcpu *v)
vcpu_check_shutdown(v);
}
-#ifdef HAS_GDBSX
+#ifdef CONFIG_HAS_GDBSX
void domain_pause_for_debugger(void)
{
struct vcpu *curr = current;
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
