diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2007-12-28 15:27:53 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2007-12-28 15:27:53 +0000 |
| commit | 0f8fcbcca397f4edcd1c7d0160e26f69b3fd79cc (patch) | |
| tree | 20c2d66f5aebf5e9e6898f3ae415291fc86be250 | |
| parent | e6bf9545fdafebfce3559fc84aa05382eb9285b6 (diff) | |
| download | xen-0f8fcbcca397f4edcd1c7d0160e26f69b3fd79cc.tar.gz xen-0f8fcbcca397f4edcd1c7d0160e26f69b3fd79cc.tar.bz2 xen-0f8fcbcca397f4edcd1c7d0160e26f69b3fd79cc.zip | |
xentrace bug fix: data format of hvmtrace is changed.
Signed-off-by: Disheng Su <disheng.su@intel.com>
| -rw-r--r-- | tools/xentrace/formats | 6 | ||||
| -rw-r--r-- | tools/xentrace/xentrace_format | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/xentrace/formats b/tools/xentrace/formats index 617bf284ed..3028ec0b0f 100644 --- a/tools/xentrace/formats +++ b/tools/xentrace/formats @@ -19,8 +19,8 @@ 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 (+%(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 --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format index 20fa7718ce..6399217bb6 100644 --- a/tools/xentrace/xentrace_format +++ b/tools/xentrace/xentrace_format @@ -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: |