* [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
@ 2017-05-08 13:39 Stefan Hajnoczi
2017-05-08 13:39 ` [Qemu-devel] [PULL for-2.9 1/1] trace: disallow more than 10 arguments per trace event Stefan Hajnoczi
2017-05-08 13:49 ` [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
0 siblings, 2 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-05-08 13:39 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL for-2.9 1/1] trace: disallow more than 10 arguments per trace event
2017-05-08 13:39 [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
@ 2017-05-08 13:39 ` Stefan Hajnoczi
2017-05-08 13:49 ` [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-05-08 13:39 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Daniel P. Berrange, Stefan Hajnoczi
From: "Daniel P. Berrange" <berrange@redhat.com>
The UST trace backend can only cope with upto 10 arguments. To ensure we
don't exceed the limit when UST is not compiled in, disallow more than
10 arguments upfront.
This prevents the case where:
commit 0fc8aec7de64f2bf83a274a2a38b938ce03425d2
Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Date: Tue Apr 18 10:20:20 2017 +0800
COLO-compare: Optimize tcp compare trace event
Optimize two trace events as one, adjust print format make
it easy to read. rename trace_colo_compare_pkt_info_src/dst
to trace_colo_compare_tcp_info.
regressed the fix done in
commit 2dfe5113b11ce0ddb08176ebb54ab7ac4104b413
Author: Alex Bennée <alex.bennee@linaro.org>
Date: Fri Oct 28 14:25:59 2016 +0100
net: split colo_compare_pkt_info into two trace events
It seems there is a limit to the number of arguments a UST trace event
can take and at 11 the previous trace command broke the build. Split the
trace into a src pkt and dst pkt trace to fix this.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20161028132559.8324-1-alex.bennee@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Now we get an immediate fail even when UST is disabled:
GEN net/trace.h
Traceback (most recent call last):
File "/home/berrange/src/virt/qemu/scripts/tracetool.py", line 154, in <module>
main(sys.argv)
File "/home/berrange/src/virt/qemu/scripts/tracetool.py", line 145, in main
events.extend(tracetool.read_events(fh))
File "/home/berrange/src/virt/qemu/scripts/tracetool/__init__.py", line 307, in read_events
event = Event.build(line)
File "/home/berrange/src/virt/qemu/scripts/tracetool/__init__.py", line 244, in build
event = Event(name, props, fmt, args)
File "/home/berrange/src/virt/qemu/scripts/tracetool/__init__.py", line 196, in __init__
"argument count" % name)
ValueError: Event 'colo_compare_tcp_info' has more than maximum permitted argument count
Makefile:96: recipe for target 'net/trace.h-timestamp' failed
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20170426153900.21066-1-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
scripts/tracetool/__init__.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 365446f..1ffbc1d 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -191,6 +191,10 @@ class Event(object):
self.event_trans = event_trans
self.event_exec = event_exec
+ if len(args) > 10:
+ raise ValueError("Event '%s' has more than maximum permitted "
+ "argument count" % name)
+
if orig is None:
self.original = weakref.ref(self)
else:
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
2017-05-08 13:39 [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
2017-05-08 13:39 ` [Qemu-devel] [PULL for-2.9 1/1] trace: disallow more than 10 arguments per trace event Stefan Hajnoczi
@ 2017-05-08 13:49 ` Stefan Hajnoczi
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-05-08 13:49 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Peter Maydell
[-- 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 --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
@ 2017-06-07 18:55 Stefan Hajnoczi
0 siblings, 0 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-06-07 18:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
@ 2017-05-12 14:38 Stefan Hajnoczi
2017-05-15 13:39 ` Stefan Hajnoczi
0 siblings, 1 reply; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-05-12 14:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
2017-05-12 14:38 Stefan Hajnoczi
@ 2017-05-15 13:39 ` Stefan Hajnoczi
0 siblings, 0 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-05-15 13:39 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Peter Maydell
[-- 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 --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
@ 2017-03-28 14:23 Stefan Hajnoczi
2017-03-28 17:37 ` Peter Maydell
0 siblings, 1 reply; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-03-28 14:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
2017-03-28 14:23 Stefan Hajnoczi
@ 2017-03-28 17:37 ` Peter Maydell
0 siblings, 0 replies; 8+ messages in thread
From: Peter Maydell @ 2017-03-28 17:37 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-06-07 18:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-08 13:39 [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
2017-05-08 13:39 ` [Qemu-devel] [PULL for-2.9 1/1] trace: disallow more than 10 arguments per trace event Stefan Hajnoczi
2017-05-08 13:49 ` [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
-- strict thread matches above, loose matches on Subject: below --
2017-06-07 18:55 Stefan Hajnoczi
2017-05-12 14:38 Stefan Hajnoczi
2017-05-15 13:39 ` Stefan Hajnoczi
2017-03-28 14:23 Stefan Hajnoczi
2017-03-28 17:37 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.