[Xen-changelog] [xen-unstable] gdbsx: Always build -- remove build-time config option.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1278093132 -3600
# Node ID 2846fd19945cb2ab32d1513531c3500278133484
# Parent  aecf092da7489bd41ffd3e58964535a0d61eb3b4
gdbsx: Always build -- remove build-time config option.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/Rules.mk                   |    2 --
 xen/arch/x86/Makefile          |    2 +-
 xen/arch/x86/domctl.c          |    9 +++------
 xen/arch/x86/hvm/svm/svm.c     |    2 --
 xen/arch/x86/hvm/vmx/vmx.c     |    2 --
 xen/include/asm-x86/debugger.h |    2 --
 xen/include/asm-x86/domain.h   |    2 --
 7 files changed, 4 insertions(+), 17 deletions(-)

diff -r aecf092da748 -r 2846fd19945c xen/Rules.mk
--- a/xen/Rules.mk      Wed Jun 30 22:12:54 2010 +0100
+++ b/xen/Rules.mk      Fri Jul 02 18:52:12 2010 +0100
@@ -8,7 +8,6 @@ perfc_arrays  ?= n
 perfc_arrays  ?= n
 lock_profile  ?= n
 crash_debug   ?= n
-gdbsx         ?= n
 frame_pointer ?= n
 
 XEN_ROOT=$(BASEDIR)/..
@@ -53,7 +52,6 @@ CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 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 -r aecf092da748 -r 2846fd19945c xen/arch/x86/Makefile
--- a/xen/arch/x86/Makefile     Wed Jun 30 22:12:54 2010 +0100
+++ b/xen/arch/x86/Makefile     Fri Jul 02 18:52:12 2010 +0100
@@ -13,6 +13,7 @@ obj-y += clear_page.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 += bzimage.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 -r aecf092da748 -r 2846fd19945c xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c     Wed Jun 30 22:12:54 2010 +0100
+++ b/xen/arch/x86/domctl.c     Fri Jul 02 18:52:12 2010 +0100
@@ -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 char kdbbyt_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
         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 -r aecf092da748 -r 2846fd19945c xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c        Wed Jun 30 22:12:54 2010 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c        Fri Jul 02 18:52:12 2010 +0100
@@ -1492,9 +1492,7 @@ asmlinkage void svm_vmexit_handler(struc
         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 -r aecf092da748 -r 2846fd19945c xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Wed Jun 30 22:12:54 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Fri Jul 02 18:52:12 2010 +0100
@@ -2406,9 +2406,7 @@ asmlinkage void vmx_vmexit_handler(struc
                 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 -r aecf092da748 -r 2846fd19945c xen/include/asm-x86/debugger.h
--- a/xen/include/asm-x86/debugger.h    Wed Jun 30 22:12:54 2010 +0100
+++ b/xen/include/asm-x86/debugger.h    Fri Jul 02 18:52:12 2010 +0100
@@ -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 -r aecf092da748 -r 2846fd19945c xen/include/asm-x86/domain.h
--- a/xen/include/asm-x86/domain.h      Wed Jun 30 22:12:54 2010 +0100
+++ b/xen/include/asm-x86/domain.h      Fri Jul 02 18:52:12 2010 +0100
@@ -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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog