# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1198855673 0
# Node ID 62c38443e9f78a00b8b29a62af8d59cd89198d08
# Parent c0a9b8ab631cf4ee089c02be890f5cf42759f7bd
xentrace bug fix: data format of hvmtrace is changed.
Signed-off-by: Disheng Su <disheng.su@xxxxxxxxx>
---
tools/xentrace/formats | 6 +++---
tools/xentrace/xentrace_format | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff -r c0a9b8ab631c -r 62c38443e9f7 tools/xentrace/formats
--- a/tools/xentrace/formats Fri Dec 28 15:26:27 2007 +0000
+++ b/tools/xentrace/formats Fri Dec 28 15:27:53 2007 +0000
@@ -19,8 +19,8 @@ 0x0002f00d CPU%(cpu)d %(tsc)d (+%(relt
0x0002f00d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) dom_timer_fn
0x00081001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMENTRY [ dom:vcpu =
0x%(1)08x ]
-0x00081002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMEXIT [ dom:vcpu =
0x%(1)08x, rIP = 0x%(2)08x, exitcode = 0x%(3)08x ]
-0x00082001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN [ dom:vcpu =
0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
+0x00081002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMEXIT [ dom:vcpu =
0x%(1)08x, exitcode = 0x%(2)08x, rIP = 0x%(3)08x ]
+0x00082001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN [ dom:vcpu =
0x%(1)08x, errorcode = 0x%(2)02x, virt = 0x%(3)08x ]
0x00082002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_INJECT [ dom:vcpu =
0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
0x00082003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INJ_EXC [ dom:vcpu =
0x%(1)08x, vector = 0x%(2)02x, errorcode = 0x%(3)04x ]
0x00082004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INJ_VIRQ [ dom:vcpu =
0x%(1)08x, vector = 0x%(2)02x, fake = %(3)d ]
@@ -45,4 +45,4 @@ 0x00082017 CPU%(cpu)d %(tsc)d (+%(relt
0x00082017 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MMIO_ASSIST [ dom:vcpu =
0x%(1)08x, data = 0x%(2)04x ]
0x00082018 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CLTS [ dom:vcpu =
0x%(1)08x ]
0x00082019 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) LMSW [ dom:vcpu =
0x%(1)08x, value = 0x%(2)08x ]
-0x00082020 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN64 [ dom:vcpu =
0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
+0x00082020 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN64 [ dom:vcpu =
0x%(1)08x, errorcode = 0x%(2)02x, virt = 0x%(3)08x ]
diff -r c0a9b8ab631c -r 62c38443e9f7 tools/xentrace/xentrace_format
--- a/tools/xentrace/xentrace_format Fri Dec 28 15:26:27 2007 +0000
+++ b/tools/xentrace/xentrace_format Fri Dec 28 15:27:53 2007 +0000
@@ -134,7 +134,7 @@ while not interrupted:
line = sys.stdin.read(struct.calcsize(D1REC))
if not line:
break
- (d1) = struct.unpack(D1REC, line)
+ d1 = struct.unpack(D1REC, line)[0]
if n_data == 2:
line = sys.stdin.read(struct.calcsize(D2REC))
if not line:
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home