# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID dfbf0939350cf8823891c26785c2af15b54e9bcd
# Parent 6d0929e34ce2cc26b8865edf3f6ce89c0e688e1d
This patch is mainly a cleanup of vmx related xentrace code. One minor
xentrace bug is fixed.
Signed-off-by: Xiaowei Yang <xiaowei.yang@xxxxxxxxx>
Signed-off-by: Yunfeng Zhao <yunfeng.zhao@xxxxxxxxx>
diff -r 6d0929e34ce2 -r dfbf0939350c tools/xentrace/Makefile
--- a/tools/xentrace/Makefile Fri Mar 24 09:57:52 2006
+++ b/tools/xentrace/Makefile Fri Mar 24 09:59:31 2006
@@ -6,7 +6,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS += -Werror -D_LARGEFILE64_SOURCE
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_LIBXC)
diff -r 6d0929e34ce2 -r dfbf0939350c tools/xentrace/formats
--- a/tools/xentrace/formats Fri Mar 24 09:57:52 2006
+++ b/tools/xentrace/formats Fri Mar 24 09:59:31 2006
@@ -16,6 +16,6 @@
0x00080002 CPU%(cpu)d %(tsc)d VMX_VECTOR [ domid
= 0x%(1)08x, eip = 0x%(2)08x, vector = 0x%(3)08x ]
0x00080003 CPU%(cpu)d %(tsc)d VMX_INT [ domid
= 0x%(1)08x, trap = 0x%(2)08x, va = 0x%(3)08x ]
-0x00090001 CPU%(cpu)d %(tsc)d VMENTRY
0x%(1)08x 0x%(2)08x 0x%(3)08x 0x%(4)08x 0x%(5)08x
-0x00090002 CPU%(cpu)d %(tsc)d VMEXIT
0x%(1)08x 0x%(2)08x 0x%(3)08x
+0x00081001 CPU%(cpu)d %(tsc)d VMEXIT
0x%(1)08x 0x%(2)08x 0x%(3)08x
+0x00081002 CPU%(cpu)d %(tsc)d VMENTRY
0x%(1)08x 0x%(2)08x 0x%(3)08x 0x%(4)08x 0x%(5)08x
diff -r 6d0929e34ce2 -r dfbf0939350c tools/xentrace/xentrace.c
--- a/tools/xentrace/xentrace.c Fri Mar 24 09:57:52 2006
+++ b/tools/xentrace/xentrace.c Fri Mar 24 09:59:31 2006
@@ -498,7 +498,7 @@
}
if ( opts.outfile )
- outfd = open(opts.outfile, O_WRONLY | O_CREAT);
+ outfd = open(opts.outfile, O_WRONLY | O_CREAT | O_LARGEFILE, 0644);
if(outfd < 0)
{
diff -r 6d0929e34ce2 -r dfbf0939350c xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Fri Mar 24 09:57:52 2006
+++ b/xen/arch/x86/hvm/vmx/vmx.c Fri Mar 24 09:59:31 2006
@@ -988,7 +988,7 @@
port = (exit_qualification >> 16) & 0xFFFF;
else
port = regs->edx & 0xffff;
- TRACE_VMEXIT(2, port);
+ TRACE_VMEXIT(1, port);
size = (exit_qualification & 7) + 1;
dir = test_bit(3, &exit_qualification); /* direction */
@@ -1913,6 +1913,7 @@
vector &= 0xff;
local_irq_disable();
+ TRACE_VMEXIT(1,vector);
switch(vector) {
case LOCAL_TIMER_VECTOR:
@@ -2042,7 +2043,6 @@
{
__vmread(GUEST_RIP, &eip);
- TRACE_3D(TRC_VMX_VMEXIT, v->domain->domain_id, eip, exit_reason);
TRACE_VMEXIT(0,exit_reason);
}
@@ -2066,7 +2066,6 @@
TRACE_VMEXIT(1,vector);
perfc_incra(cause_vector, vector);
- TRACE_3D(TRC_VMX_VECTOR, v->domain->domain_id, eip, vector);
switch (vector) {
#ifdef XEN_DEBUGGER
case TRAP_debug:
@@ -2250,7 +2249,7 @@
asmlinkage void vmx_trace_vmentry (void)
{
- TRACE_5D(TRC_VMENTRY,
+ TRACE_5D(TRC_VMX_VMENTRY,
trace_values[smp_processor_id()][0],
trace_values[smp_processor_id()][1],
trace_values[smp_processor_id()][2],
@@ -2266,7 +2265,7 @@
asmlinkage void vmx_trace_vmexit (void)
{
- TRACE_3D(TRC_VMEXIT,0,0,0);
+ TRACE_3D(TRC_VMX_VMEXIT,0,0,0);
return;
}
diff -r 6d0929e34ce2 -r dfbf0939350c xen/include/public/trace.h
--- a/xen/include/public/trace.h Fri Mar 24 09:57:52 2006
+++ b/xen/include/public/trace.h Fri Mar 24 09:59:31 2006
@@ -24,7 +24,6 @@
#define TRC_VMXTIMER 0x00082000 /* VMX timer trace */
#define TRC_VMXINT 0x00084000 /* VMX interrupt trace */
#define TRC_VMXIO 0x00088000 /* VMX io emulation trace */
-#define TRC_VMEXIT_HANDLER 0x00090000 /* VMX handler trace */
/* Trace events per class */
@@ -50,14 +49,11 @@
/* trace events per subclass */
#define TRC_VMX_VMEXIT (TRC_VMXEXIT + 1)
-#define TRC_VMX_VECTOR (TRC_VMXEXIT + 2)
+#define TRC_VMX_VMENTRY (TRC_VMXEXIT + 2)
#define TRC_VMX_TIMER_INTR (TRC_VMXTIMER + 1)
#define TRC_VMX_INT (TRC_VMXINT + 1)
-
-#define TRC_VMEXIT (TRC_VMEXIT_HANDLER + 1)
-#define TRC_VMENTRY (TRC_VMEXIT_HANDLER + 2)
/* This structure represents a single trace buffer record. */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home