# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID a663683fe8cb2eaea33f18d55bb8b0ee93867d9b
# Parent f33f18fbf2cb6872a2aa4303e83ab0af856f3f8c
Remove trace compile option from Xen.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
diff -r f33f18fbf2cb -r a663683fe8cb xen/Rules.mk
--- a/xen/Rules.mk Sun Oct 30 21:31:45 2005
+++ b/xen/Rules.mk Sun Oct 30 21:35:06 2005
@@ -6,7 +6,6 @@
debug ?= n
perfc ?= n
perfc_arrays?= n
-trace ?= y
domu_debug ?= n
crash_debug ?= n
@@ -71,10 +70,6 @@
endif
endif
-ifeq ($(trace),y)
-CFLAGS += -DTRACE_BUFFER
-endif
-
CFLAGS := $(strip $(CFLAGS))
%.o: %.c $(HDRS) Makefile
diff -r f33f18fbf2cb -r a663683fe8cb xen/arch/x86/vmx.c
--- a/xen/arch/x86/vmx.c Sun Oct 30 21:31:45 2005
+++ b/xen/arch/x86/vmx.c Sun Oct 30 21:35:06 2005
@@ -50,12 +50,8 @@
unsigned int opt_vmx_debug_level = 0;
integer_param("vmx_debug", opt_vmx_debug_level);
-#ifdef TRACE_BUFFER
static unsigned long trace_values[NR_CPUS][4];
#define TRACE_VMEXIT(index,value) trace_values[current->processor][index]=value
-#else
-#define TRACE_VMEXIT(index,value) ((void)0)
-#endif
static int vmx_switch_on;
@@ -1686,13 +1682,11 @@
return;
}
-#ifdef TRACE_BUFFER
{
__vmread(GUEST_RIP, &eip);
TRACE_3D(TRC_VMX_VMEXIT, v->domain->domain_id, eip, exit_reason);
TRACE_VMEXIT(0,exit_reason);
}
-#endif
switch (exit_reason) {
case EXIT_REASON_EXCEPTION_NMI:
@@ -1881,7 +1875,6 @@
#endif
}
-#ifdef TRACE_BUFFER
asmlinkage void trace_vmentry (void)
{
TRACE_5D(TRC_VMENTRY,trace_values[current->processor][0],
@@ -1899,7 +1892,6 @@
TRACE_3D(TRC_VMEXIT,0,0,0);
return;
}
-#endif
#endif /* CONFIG_VMX */
/*
diff -r f33f18fbf2cb -r a663683fe8cb xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S Sun Oct 30 21:31:45 2005
+++ b/xen/arch/x86/x86_32/entry.S Sun Oct 30 21:35:06 2005
@@ -126,9 +126,7 @@
ENTRY(vmx_asm_vmexit_handler)
/* selectors are restored/saved by VMX */
VMX_SAVE_ALL_NOSEGREGS
-#ifdef TRACE_BUFFER
call trace_vmexit
-#endif
call vmx_vmexit_handler
jmp vmx_asm_do_resume
@@ -150,9 +148,7 @@
/* vmx_restore_all_guest */
call vmx_intr_assist
call load_cr2
-#ifdef TRACE_BUFFER
call trace_vmentry
-#endif
.endif
VMX_RESTORE_ALL_NOSEGREGS
/*
diff -r f33f18fbf2cb -r a663683fe8cb xen/common/Makefile
--- a/xen/common/Makefile Sun Oct 30 21:31:45 2005
+++ b/xen/common/Makefile Sun Oct 30 21:35:06 2005
@@ -9,10 +9,6 @@
OBJS := $(subst perfc.o,,$(OBJS))
endif
-ifneq ($(trace),y)
-OBJS := $(subst trace.o,,$(OBJS))
-endif
-
default: common.o
common.o: $(OBJS)
$(LD) $(LDFLAGS) -r -o common.o $(OBJS)
diff -r f33f18fbf2cb -r a663683fe8cb xen/common/dom0_ops.c
--- a/xen/common/dom0_ops.c Sun Oct 30 21:31:45 2005
+++ b/xen/common/dom0_ops.c Sun Oct 30 21:35:06 2005
@@ -517,14 +517,12 @@
}
break;
-#ifdef TRACE_BUFFER
case DOM0_TBUFCONTROL:
{
ret = tb_control(&op->u.tbufcontrol);
copy_to_user(u_dom0_op, op, sizeof(*op));
}
break;
-#endif
case DOM0_READCONSOLE:
{
diff -r f33f18fbf2cb -r a663683fe8cb xen/include/xen/trace.h
--- a/xen/include/xen/trace.h Sun Oct 30 21:31:45 2005
+++ b/xen/include/xen/trace.h Sun Oct 30 21:35:06 2005
@@ -22,8 +22,6 @@
#ifndef __XEN_TRACE_H__
#define __XEN_TRACE_H__
-
-#ifdef TRACE_BUFFER
#include <asm/page.h>
#include <xen/types.h>
@@ -120,17 +118,4 @@
#define TRACE_4D(event,d1,d2,d3,d4) trace_do_casts(event,d1,d2,d3,d4,0 )
#define TRACE_5D(event,d1,d2,d3,d4,d5) trace_do_casts(event,d1,d2,d3,d4,d5)
-#else
-
-#define init_trace_bufs() ((void)0)
-
-#define TRACE_0D(event) ((void)0)
-#define TRACE_1D(event,d) ((void)0)
-#define TRACE_2D(event,d1,d2) ((void)0)
-#define TRACE_3D(event,d1,d2,d3) ((void)0)
-#define TRACE_4D(event,d1,d2,d3,d4) ((void)0)
-#define TRACE_5D(event,d1,d2,d3,d4,d5) ((void)0)
-
-#endif /* TRACE_BUFFER */
-
#endif /* __XEN_TRACE_H__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home