gdbsx: Always build -- remove build-time config option.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

7 files changed, 4 insertions, 17 deletions

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 53bfab459d..d3348144c0 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -8,7 +8,6 @@ perfc         ?= n
 perfc_arrays  ?= n
 lock_profile  ?= n
 crash_debug   ?= n
-gdbsx         ?= n
 frame_pointer ?= n
 
 XEN_ROOT=$(BASEDIR)/..
@@ -53,7 +52,6 @@ CFLAGS-$(perfc)         += -DPERF_COUNTERS
 CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
 CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER
-CFLAGS-$(gdbsx)         += -DXEN_GDBSX_CONFIG
 
 ifneq ($(max_phys_cpus),)
 CFLAGS-y                += -DMAX_PHYS_CPUS=$(max_phys_cpus)
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 9aeb1cebb7..808d1f5d7d 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -13,6 +13,7 @@ obj-y += bitops.o
 obj-y += clear_page.o
 obj-y += copy_page.o
 obj-y += compat.o
+obj-y += debug.o
 obj-y += delay.o
 obj-y += dmi_scan.o
 obj-y += domctl.o
@@ -57,7 +58,6 @@ obj-y += hpet.o
 obj-y += bzimage.o
 
 obj-$(crash_debug) += gdbstub.o
-obj-$(gdbsx) += debug.o
 
 x86_emulate.o: x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h
 
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 6af77a2cd9..e598936035 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -34,7 +34,6 @@
 #include <public/mem_event.h>
 #include <asm/mem_sharing.h>
 
-#ifdef XEN_GDBSX_CONFIG                    
 #ifdef XEN_KDB_CONFIG
 #include "../kdb/include/kdbdefs.h"
 #include "../kdb/include/kdbproto.h"
@@ -43,8 +42,9 @@ typedef unsigned long kdbva_t;
 typedef unsigned char kdbbyt_t;
 extern int dbg_rw_mem(kdbva_t, kdbbyt_t *, int, domid_t, int, uint64_t);
 #endif
-static int 
-gdbsx_guest_mem_io(domid_t domid, struct xen_domctl_gdbsx_memio *iop)
+
+static int gdbsx_guest_mem_io(
+    domid_t domid, struct xen_domctl_gdbsx_memio *iop)
 {   
     ulong l_uva = (ulong)iop->uva;
     iop->remain = dbg_rw_mem(
@@ -52,7 +52,6 @@ gdbsx_guest_mem_io(domid_t domid, struct xen_domctl_gdbsx_memio *iop)
         iop->gwr, iop->pgd3val);
     return (iop->remain ? -EFAULT : 0);
 }
-#endif  /* XEN_GDBSX_CONFIG */
 
 long arch_do_domctl(
     struct xen_domctl *domctl,
@@ -1309,7 +1308,6 @@ long arch_do_domctl(
     }
     break;
 
-#ifdef XEN_GDBSX_CONFIG
     case XEN_DOMCTL_gdbsx_guestmemio:
     {
         struct domain *d;
@@ -1418,7 +1416,6 @@ long arch_do_domctl(
         rcu_unlock_domain(d);
     }
     break;
-#endif /* XEN_GDBSX_CONFIG */
 
 #ifdef __x86_64__
     case XEN_DOMCTL_mem_event_op:
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index ba0cf802cf..0953719fe8 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -1492,9 +1492,7 @@ asmlinkage void svm_vmexit_handler(struct cpu_user_regs *regs)
         if ( (inst_len = __get_instruction_length(v, INSTR_INT3)) == 0 )
             break;
         __update_guest_eip(regs, inst_len);
-#ifdef XEN_GDBSX_CONFIG
         current->arch.gdbsx_vcpu_event = TRAP_int3;
-#endif
         domain_pause_for_debugger();
         break;
 
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index c4093154a4..36521d7695 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2406,9 +2406,7 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs *regs)
                 goto exit_and_crash;
             inst_len = __get_instruction_length(); /* Safe: INT3 */
             __update_guest_eip(inst_len);
-#ifdef XEN_GDBSX_CONFIG
             current->arch.gdbsx_vcpu_event = TRAP_int3;
-#endif
             domain_pause_for_debugger();
             break;
         case TRAP_no_device:
diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h
index 318b38a3e7..9fea5d64e8 100644
--- a/xen/include/asm-x86/debugger.h
+++ b/xen/include/asm-x86/debugger.h
@@ -68,10 +68,8 @@ static inline int debugger_trap_entry(
     if ( guest_kernel_mode(v, regs) && v->domain->debugger_attached &&
          ((vector == TRAP_int3) || (vector == TRAP_debug)) )
     {
-#ifdef XEN_GDBSX_CONFIG
         if ( vector != TRAP_debug ) /* domain pause is good enough */
             current->arch.gdbsx_vcpu_event = vector;
-#endif
         domain_pause_for_debugger();
         return 1;
     }
diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index 98712abf8e..e677748ed7 100644
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -415,9 +415,7 @@ struct arch_vcpu
     struct mapcache_vcpu mapcache;
 #endif
 
-#if XEN_GDBSX_CONFIG
     uint32_t gdbsx_vcpu_event;
-#endif 
 
     /* A secondary copy of the vcpu time info. */
     XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest;