[Xen-devel] [PATCH v7 14/28] build: convert HAS_GDBSX use to Kconfig

[Doug Goldstein <cardoe@xxxxxxxxxx>]

Use the Kconfig generated CONFIG_HAS_GDBSX defines in the code base.

CC: Keir Fraser <keir@xxxxxxx>
CC: Jan Beulich <jbeulich@xxxxxxxx>
CC: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
---
 xen/Rules.mk          | 1 -
 xen/arch/x86/Kconfig  | 1 +
 xen/arch/x86/Rules.mk | 1 -
 xen/common/Kconfig    | 4 ++++
 xen/common/domain.c   | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 09783e7..f572c0d 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/Kconfig b/xen/arch/x86/Kconfig
index b8372d1..e95070b 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -5,6 +5,7 @@ config X86
        def_bool y
        select HAS_ACPI
        select HAS_CPUFREQ
+       select HAS_GDBSX
        select HAS_IOPORTS
        select HAS_NS16550
        select HAS_PASSTHROUGH
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 645d44c..009f702 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -4,7 +4,6 @@
 HAS_NUMA := y
 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 ea04d11..75edd45 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -5,6 +5,10 @@ menu "Common Features"
 config HAS_DEVICE_TREE
        bool
 
+# Select HAS_GDBSX if GDBSX is supported
+config HAS_GDBSX
+       bool
+
 config HAS_IOPORTS
        bool
 
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@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel