ia64/xen-unstable

changeset 16673:62c38443e9f7

xentrace bug fix: data format of hvmtrace is changed.
Signed-off-by: Disheng Su <disheng.su@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Dec 28 15:27:53 2007 +0000 (2007-12-28)
parents c0a9b8ab631c
children ad0f20f5590a
files tools/xentrace/formats tools/xentrace/xentrace_format
line diff
     1.1 --- a/tools/xentrace/formats	Fri Dec 28 15:26:27 2007 +0000
     1.2 +++ b/tools/xentrace/formats	Fri Dec 28 15:27:53 2007 +0000
     1.3 @@ -19,8 +19,8 @@ 0x0002f00c  CPU%(cpu)d  %(tsc)d (+%(relt
     1.4  0x0002f00d  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  dom_timer_fn
     1.5  
     1.6  0x00081001  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  VMENTRY     [ dom:vcpu = 0x%(1)08x ]
     1.7 -0x00081002  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  VMEXIT      [ dom:vcpu = 0x%(1)08x, rIP  = 0x%(2)08x, exitcode = 0x%(3)08x ]
     1.8 -0x00082001  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN      [ dom:vcpu = 0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
     1.9 +0x00081002  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  VMEXIT      [ dom:vcpu = 0x%(1)08x, exitcode = 0x%(2)08x, rIP  = 0x%(3)08x ]
    1.10 +0x00082001  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN      [ dom:vcpu = 0x%(1)08x, errorcode = 0x%(2)02x, virt = 0x%(3)08x ]
    1.11  0x00082002  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_INJECT   [ dom:vcpu = 0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
    1.12  0x00082003  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  INJ_EXC     [ dom:vcpu = 0x%(1)08x, vector = 0x%(2)02x, errorcode = 0x%(3)04x ]
    1.13  0x00082004  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  INJ_VIRQ    [ dom:vcpu = 0x%(1)08x, vector = 0x%(2)02x, fake = %(3)d ]
    1.14 @@ -45,4 +45,4 @@ 0x00082016  CPU%(cpu)d  %(tsc)d (+%(relt
    1.15  0x00082017  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  MMIO_ASSIST [ dom:vcpu = 0x%(1)08x, data = 0x%(2)04x ]
    1.16  0x00082018  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  CLTS        [ dom:vcpu = 0x%(1)08x ]
    1.17  0x00082019  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  LMSW        [ dom:vcpu = 0x%(1)08x, value = 0x%(2)08x ]
    1.18 -0x00082020  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN64    [ dom:vcpu = 0x%(1)08x, virt = 0x%(2)08x, errorcode = 0x%(3)02x ]
    1.19 +0x00082020  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  PF_XEN64    [ dom:vcpu = 0x%(1)08x, errorcode = 0x%(2)02x, virt = 0x%(3)08x ]
     2.1 --- a/tools/xentrace/xentrace_format	Fri Dec 28 15:26:27 2007 +0000
     2.2 +++ b/tools/xentrace/xentrace_format	Fri Dec 28 15:27:53 2007 +0000
     2.3 @@ -134,7 +134,7 @@ while not interrupted:
     2.4              line = sys.stdin.read(struct.calcsize(D1REC))
     2.5              if not line:
     2.6                  break
     2.7 -            (d1) = struct.unpack(D1REC, line)
     2.8 +            d1 = struct.unpack(D1REC, line)[0]
     2.9          if n_data == 2:
    2.10              line = sys.stdin.read(struct.calcsize(D2REC))
    2.11              if not line: