direct-io.hg

changeset 7567:a663683fe8cb

Remove trace compile option from Xen.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Sun Oct 30 22:35:06 2005 +0100 (2005-10-30)
parents f33f18fbf2cb
children d8a39152f982
files xen/Rules.mk xen/arch/x86/vmx.c xen/arch/x86/x86_32/entry.S xen/common/Makefile xen/common/dom0_ops.c xen/include/xen/trace.h
line diff
     1.1 --- a/xen/Rules.mk	Sun Oct 30 22:31:45 2005 +0100
     1.2 +++ b/xen/Rules.mk	Sun Oct 30 22:35:06 2005 +0100
     1.3 @@ -6,7 +6,6 @@ verbose     ?= n
     1.4  debug       ?= n
     1.5  perfc       ?= n
     1.6  perfc_arrays?= n
     1.7 -trace       ?= y
     1.8  domu_debug  ?= n
     1.9  crash_debug ?= n
    1.10  
    1.11 @@ -71,10 +70,6 @@ CFLAGS += -DPERF_ARRAYS
    1.12  endif
    1.13  endif
    1.14  
    1.15 -ifeq ($(trace),y)
    1.16 -CFLAGS += -DTRACE_BUFFER
    1.17 -endif
    1.18 -
    1.19  CFLAGS := $(strip $(CFLAGS))
    1.20  
    1.21  %.o: %.c $(HDRS) Makefile
     2.1 --- a/xen/arch/x86/vmx.c	Sun Oct 30 22:31:45 2005 +0100
     2.2 +++ b/xen/arch/x86/vmx.c	Sun Oct 30 22:35:06 2005 +0100
     2.3 @@ -50,12 +50,8 @@ int hvm_enabled;
     2.4  unsigned int opt_vmx_debug_level = 0;
     2.5  integer_param("vmx_debug", opt_vmx_debug_level);
     2.6  
     2.7 -#ifdef TRACE_BUFFER
     2.8  static unsigned long trace_values[NR_CPUS][4];
     2.9  #define TRACE_VMEXIT(index,value) trace_values[current->processor][index]=value
    2.10 -#else
    2.11 -#define TRACE_VMEXIT(index,value) ((void)0)
    2.12 -#endif
    2.13  
    2.14  static int vmx_switch_on;
    2.15  
    2.16 @@ -1686,13 +1682,11 @@ asmlinkage void vmx_vmexit_handler(struc
    2.17          return;
    2.18      }
    2.19  
    2.20 -#ifdef TRACE_BUFFER
    2.21      {
    2.22          __vmread(GUEST_RIP, &eip);
    2.23          TRACE_3D(TRC_VMX_VMEXIT, v->domain->domain_id, eip, exit_reason);
    2.24          TRACE_VMEXIT(0,exit_reason);
    2.25      }
    2.26 -#endif
    2.27  
    2.28      switch (exit_reason) {
    2.29      case EXIT_REASON_EXCEPTION_NMI:
    2.30 @@ -1881,7 +1875,6 @@ asmlinkage void load_cr2(void)
    2.31  #endif
    2.32  }
    2.33  
    2.34 -#ifdef TRACE_BUFFER
    2.35  asmlinkage void trace_vmentry (void)
    2.36  {
    2.37      TRACE_5D(TRC_VMENTRY,trace_values[current->processor][0],
    2.38 @@ -1899,7 +1892,6 @@ asmlinkage void trace_vmexit (void)
    2.39      TRACE_3D(TRC_VMEXIT,0,0,0);
    2.40      return;
    2.41  }
    2.42 -#endif
    2.43  #endif /* CONFIG_VMX */
    2.44  
    2.45  /*
     3.1 --- a/xen/arch/x86/x86_32/entry.S	Sun Oct 30 22:31:45 2005 +0100
     3.2 +++ b/xen/arch/x86/x86_32/entry.S	Sun Oct 30 22:35:06 2005 +0100
     3.3 @@ -126,9 +126,7 @@
     3.4  ENTRY(vmx_asm_vmexit_handler)
     3.5          /* selectors are restored/saved by VMX */
     3.6          VMX_SAVE_ALL_NOSEGREGS
     3.7 -#ifdef TRACE_BUFFER
     3.8          call trace_vmexit
     3.9 -#endif
    3.10          call vmx_vmexit_handler
    3.11          jmp vmx_asm_do_resume
    3.12  
    3.13 @@ -150,9 +148,7 @@ 1:
    3.14  /* vmx_restore_all_guest */
    3.15          call vmx_intr_assist
    3.16          call load_cr2
    3.17 -#ifdef TRACE_BUFFER
    3.18          call trace_vmentry
    3.19 -#endif
    3.20          .endif
    3.21          VMX_RESTORE_ALL_NOSEGREGS
    3.22          /* 
     4.1 --- a/xen/common/Makefile	Sun Oct 30 22:31:45 2005 +0100
     4.2 +++ b/xen/common/Makefile	Sun Oct 30 22:35:06 2005 +0100
     4.3 @@ -9,10 +9,6 @@ ifneq ($(perfc),y)
     4.4  OBJS := $(subst perfc.o,,$(OBJS))
     4.5  endif
     4.6  
     4.7 -ifneq ($(trace),y)
     4.8 -OBJS := $(subst trace.o,,$(OBJS))
     4.9 -endif
    4.10 -
    4.11  default: common.o
    4.12  common.o: $(OBJS)
    4.13  	$(LD) $(LDFLAGS) -r -o common.o $(OBJS)
     5.1 --- a/xen/common/dom0_ops.c	Sun Oct 30 22:31:45 2005 +0100
     5.2 +++ b/xen/common/dom0_ops.c	Sun Oct 30 22:35:06 2005 +0100
     5.3 @@ -517,14 +517,12 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
     5.4      }
     5.5      break;
     5.6  
     5.7 -#ifdef TRACE_BUFFER
     5.8      case DOM0_TBUFCONTROL:
     5.9      {
    5.10          ret = tb_control(&op->u.tbufcontrol);
    5.11          copy_to_user(u_dom0_op, op, sizeof(*op));
    5.12      }
    5.13      break;
    5.14 -#endif
    5.15      
    5.16      case DOM0_READCONSOLE:
    5.17      {
     6.1 --- a/xen/include/xen/trace.h	Sun Oct 30 22:31:45 2005 +0100
     6.2 +++ b/xen/include/xen/trace.h	Sun Oct 30 22:35:06 2005 +0100
     6.3 @@ -23,8 +23,6 @@
     6.4  #ifndef __XEN_TRACE_H__
     6.5  #define __XEN_TRACE_H__
     6.6  
     6.7 -#ifdef TRACE_BUFFER
     6.8 -
     6.9  #include <asm/page.h>
    6.10  #include <xen/types.h>
    6.11  #include <xen/sched.h>
    6.12 @@ -120,17 +118,4 @@ static inline int trace(u32 event, unsig
    6.13  #define TRACE_4D(event,d1,d2,d3,d4)    trace_do_casts(event,d1,d2,d3,d4,0 )
    6.14  #define TRACE_5D(event,d1,d2,d3,d4,d5) trace_do_casts(event,d1,d2,d3,d4,d5)
    6.15  
    6.16 -#else
    6.17 -
    6.18 -#define init_trace_bufs() ((void)0)
    6.19 -
    6.20 -#define TRACE_0D(event)                ((void)0)
    6.21 -#define TRACE_1D(event,d)              ((void)0)
    6.22 -#define TRACE_2D(event,d1,d2)          ((void)0)
    6.23 -#define TRACE_3D(event,d1,d2,d3)       ((void)0)
    6.24 -#define TRACE_4D(event,d1,d2,d3,d4)    ((void)0)
    6.25 -#define TRACE_5D(event,d1,d2,d3,d4,d5) ((void)0)
    6.26 -
    6.27 -#endif /* TRACE_BUFFER */
    6.28 -
    6.29  #endif /* __XEN_TRACE_H__ */