[Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit eb06c9e2d3c8f026a206e8402b0ffa201060ec8e:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-03-27 17:34:50 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 7609ffb9191e3fc473203f4bd58b934161eab358:

  trace: fix tcg tracing build breakage (2017-03-28 11:07:46 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Stefan Hajnoczi (1):
  trace: fix tcg tracing build breakage

 docs/tracing.txt                         |  3 +++
 trace/Makefile.objs                      | 16 ++++++++--------
 scripts/tracetool/format/tcg_h.py        |  1 +
 scripts/tracetool/format/tcg_helper_c.py |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

-- 
2.9.3

Re: [Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Peter Maydell]

On 28 March 2017 at 15:23, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit eb06c9e2d3c8f026a206e8402b0ffa201060ec8e:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-03-27 17:34:50 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 7609ffb9191e3fc473203f4bd58b934161eab358:
>
>   trace: fix tcg tracing build breakage (2017-03-28 11:07:46 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Stefan Hajnoczi (1):
>   trace: fix tcg tracing build breakage
>
>  docs/tracing.txt                         |  3 +++
>  trace/Makefile.objs                      | 16 ++++++++--------
>  scripts/tracetool/format/tcg_h.py        |  1 +
>  scripts/tracetool/format/tcg_helper_c.py |  1 +
>  4 files changed, 13 insertions(+), 8 deletions(-)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit dd1559bb267becbb838de41132ef60771d183e5d:

  Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging (2017-05-05 17:07:55 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to f3fddaf60b9b983b82cd11e8087e7c8a3903ee14:

  trace: disallow more than 10 arguments per trace event (2017-05-08 09:38:30 -0400)

----------------------------------------------------------------

----------------------------------------------------------------

Daniel P. Berrange (1):
  trace: disallow more than 10 arguments per trace event

 scripts/tracetool/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

-- 
2.9.3

Re: [Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 997 bytes --]

On Mon, May 08, 2017 at 09:39:07AM -0400, Stefan Hajnoczi wrote:
> The following changes since commit dd1559bb267becbb838de41132ef60771d183e5d:
> 
>   Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging (2017-05-05 17:07:55 +0100)
> 
> are available in the git repository at:
> 
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
> 
> for you to fetch changes up to f3fddaf60b9b983b82cd11e8087e7c8a3903ee14:
> 
>   trace: disallow more than 10 arguments per trace event (2017-05-08 09:38:30 -0400)
> 
> ----------------------------------------------------------------
> 
> ----------------------------------------------------------------
> 
> Daniel P. Berrange (1):
>   trace: disallow more than 10 arguments per trace event
> 
>  scripts/tracetool/__init__.py | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> -- 
> 2.9.3
> 
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

[Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit ecc1f5adeec4e3324d1b695a7c54e3967c526949:

  maintainers: Add myself as linux-user reviewer (2017-05-11 13:31:11 -0400)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 5651743c908d8c3b1ff0192ce9543a502ec7a206:

  trace: add sanity check (2017-05-12 10:37:40 -0400)

----------------------------------------------------------------

----------------------------------------------------------------

Anthony Xu (1):
  trace: add sanity check

 qom/cpu.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.9.3

Re: [Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

On Fri, May 12, 2017 at 10:38:11AM -0400, Stefan Hajnoczi wrote:
> The following changes since commit ecc1f5adeec4e3324d1b695a7c54e3967c526949:
> 
>   maintainers: Add myself as linux-user reviewer (2017-05-11 13:31:11 -0400)
> 
> are available in the git repository at:
> 
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
> 
> for you to fetch changes up to 5651743c908d8c3b1ff0192ce9543a502ec7a206:
> 
>   trace: add sanity check (2017-05-12 10:37:40 -0400)
> 
> ----------------------------------------------------------------
> 
> ----------------------------------------------------------------
> 
> Anthony Xu (1):
>   trace: add sanity check
> 
>  qom/cpu.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> -- 
> 2.9.3
> 
> 

Thanks, applied to my master tree:
https://github.com/stefanha/qemu/commits/master

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

[Qemu-devel] [PULL for-2.9 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 0db1851becbefe3e50cfc03776fb1f75817376af:

  Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.10-pull-request' into staging (2017-06-07 11:56:00 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 249e9f792c4c6e52058570e83b550ec8310f621e:

  simpletrace: Improve the error message if event is not declared (2017-06-07 14:34:19 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Jose Ricardo Ziviani (1):
  simpletrace: Improve the error message if event is not declared

 scripts/simpletrace.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-- 
2.9.4

[Qemu-devel] [PULL for-2.9 1/1] simpletrace: Improve the error message if event is not declared

[Stefan Hajnoczi]

From: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com>

Today, if we use a trace-event file which does not declare an event
existing in the log file we'll get the following error:

$ scripts/simpletrace.py trace-events trace-68508
Traceback (most recent call last):
  File "scripts/simpletrace.py", line 242, in <module>
    run(Formatter())
  File "scripts/simpletrace.py", line 217, in run
    process(events, sys.argv[2], analyzer, read_header=read_header)
  File "scripts/simpletrace.py", line 192, in process
    for rec in read_trace_records(edict, log):
  File "scripts/simpletrace.py", line 107, in read_trace_records
    rec = read_record(edict, idtoname, fobj)
  File "scripts/simpletrace.py", line 71, in read_record
    return get_record(edict, idtoname, rechdr, fobj)
  File "scripts/simpletrace.py", line 45, in get_record
    event = edict[name]
KeyError: 'qemu_mutex_locked'

This patch improves this error by adding a hint instead of just that
KeyError log:

$ scripts/simpletrace.py trace-events trace-68508
'qemu_mutex_locked' event is logged but is not declared in the trace
events file, try using trace-events-all instead.

Signed-off-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1496075404-8845-1-git-send-email-joserz@linux.vnet.ibm.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/simpletrace.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index d60b3a0..f1be6e4 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -42,7 +42,15 @@ def get_record(edict, idtoname, rechdr, fobj):
         event_id = rechdr[0]
         name = idtoname[event_id]
         rec = (name, rechdr[1], rechdr[3])
-        event = edict[name]
+        try:
+            event = edict[name]
+        except KeyError, e:
+            import sys
+            sys.stderr.write('%s event is logged but is not declared ' \
+                             'in the trace events file, try using ' \
+                             'trace-events-all instead.\n' % str(e))
+            sys.exit(1)
+
         for type, name in event.args:
             if is_string(type):
                 l = fobj.read(4)
-- 
2.9.4