commit 9096b78a38a22963ca59bb16d54a772aa86d5159
author Daniel P. Berrange <berrange@redhat.com> Tue Oct 04 14:35:57 2016 +0100
committer Stefan Hajnoczi <stefanha@redhat.com> Wed Oct 12 09:54:52 2016 +0200
tree 4e779f2acd0f30ccfe295cf14c0e165eb48bb49a
parent d1b97bcea3586bad572879f22437f44c690874cb

trace: push reading of events up a level to tracetool main

Move the reading of events out of the 'tracetool.generate'
method and into tracetool.main, so that the latter is not
tied to generating from a single source of events.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-19-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

scripts/tracetool.py

diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 7b82959..6accbbf 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -129,8 +129,10 @@
         if probe_prefix is None:
             probe_prefix = ".".join(["qemu", target_type, target_name])
 
+    events = tracetool.read_events(sys.stdin)
+
     try:
-        tracetool.generate(sys.stdin, arg_format, arg_backends,
+        tracetool.generate(events, arg_format, arg_backends,
                            binary=binary, probe_prefix=probe_prefix)
     except tracetool.TracetoolError as e:
         error_opt(str(e))