[Qemu-devel] [PATCH 5/6] trace: [tracetool] Process the "disable" event property

[Lluís Vilanova]

Signed-off-by: Lluís Vilanova <address@hidden>
---
 scripts/tracetool.py |   13 +++++++++++--
 trace-events         |    2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index e3e665d..5432f61 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -365,6 +365,9 @@ def dtrace_d(events):
     print '};'
     return
 
+def dtrace_nop_d(events):
+    pass
+
 def dtrace_stp(events):
     for event in events:
         # Define prototype for probe arguments
@@ -387,6 +390,9 @@ probe %(probeprefix)s.%(name)s = 
process("%(binary)s").mark("%(name)s")
     print
     return
 
+def dtrace_nop_stp(events):
+    pass
+
 def trace_stap_begin():
     global probeprefix
     if backend != "dtrace":
@@ -429,6 +435,8 @@ converters = {
     'nop': {
         'h': nop_h,
         'c': nop_c,
+        'd': dtrace_nop_d,
+        'stap': dtrace_nop_stp,
     },
 
     'stderr': {
@@ -555,10 +563,11 @@ def main():
         sys.exit(0)
 
     events = read_events(sys.stdin)
+
     trace_gen[output]['begin']()
-    converters[backend][output](events)
+    converters[backend][output]([ e for e in events if 'disable' not in 
e.properties ])
+    converters['nop'][output]([ e for e in events if 'disable' in e.properties 
])
     trace_gen[output]['end']()
-    return
 
 if __name__ == "__main__":
     main()
diff --git a/trace-events b/trace-events
index 514849a..ac511ae 100644
--- a/trace-events
+++ b/trace-events
@@ -636,4 +636,4 @@ dma_bdrv_io(void *dbs, void *bs, int64_t sector_num, bool 
to_dev) "dbs=%p bs=%p
 dma_aio_cancel(void *dbs) "dbs=%p"
 dma_complete(void *dbs, int ret, void *cb) "dbs=%p ret=%d cb=%p"
 dma_bdrv_cb(void *dbs, int ret) "dbs=%p ret=%d"
-dma_map_wait(void *dbs) "dbs=%p"
+disable dma_map_wait(void *dbs) "dbs=%p"