* [Qemu-devel] [PULL for-2.9 0/1] Tracing patches
@ 2017-03-28 14:23 Stefan Hajnoczi
2017-03-28 14:23 ` [Qemu-devel] [PULL for-2.9 1/1] trace: fix tcg tracing build breakage Stefan Hajnoczi
2017-03-28 17:37 ` [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Peter Maydell
0 siblings, 2 replies; 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
* [Qemu-devel] [PULL for-2.9 1/1] trace: fix tcg tracing build breakage
2017-03-28 14:23 [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
@ 2017-03-28 14:23 ` Stefan Hajnoczi
2017-03-28 17:37 ` [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Peter Maydell
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2017-03-28 14:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
Commit 0ab8ed18a6fe98bfc82705b0f041fbf2a8ca5b60 ("trace: switch to
modular code generation for sub-directories") forgot to convert "tcg"
trace events to the modular code generation approach where each
sub-directory has its own trace-events file.
This patch fixes compilation for "tcg" trace events. Currently they are
only used in the root ./trace-events file.
"tcg" trace events can only be used in the root ./trace-events file for
the time being.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20170327131718.18268-1-stefanha@redhat.com
Suggested-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
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(-)
diff --git a/docs/tracing.txt b/docs/tracing.txt
index e14bb6d..8c0029b 100644
--- a/docs/tracing.txt
+++ b/docs/tracing.txt
@@ -405,6 +405,9 @@ information. If used together with the "tcg" property, it adds a second
"TCGv_env" argument that must point to the per-target global TCG register that
points to the vCPU when guest code is executed (usually the "cpu_env" variable).
+The "tcg" and "vcpu" properties are currently only honored in the root
+./trace-events file.
+
The following example events:
foo(uint32_t a) "a=%x"
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 1b8eb4a..afd571c 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -9,27 +9,27 @@ $(BUILD_DIR)/trace-events-all: $(trace-events-files)
$(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers-wrappers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
- --group=all \
+ --group=root \
--format=tcg-helper-wrapper-h \
--backend=$(TRACE_BACKENDS) \
$< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
$(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
- --group=all \
+ --group=root \
--format=tcg-helper-h \
--backend=$(TRACE_BACKENDS) \
$< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
$(obj)/generated-helpers.c: $(obj)/generated-helpers.c-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.c-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
- --group=all \
+ --group=root \
--format=tcg-helper-c \
--backend=$(TRACE_BACKENDS) \
$< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
@@ -41,9 +41,9 @@ target-obj-y += generated-helpers.o
$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-tcg-tracers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
- --group=all \
+ --group=root \
--format=tcg-h \
--backend=$(TRACE_BACKENDS) \
$< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py
index 7ddc4a5..db55f52 100644
--- a/scripts/tracetool/format/tcg_h.py
+++ b/scripts/tracetool/format/tcg_h.py
@@ -40,6 +40,7 @@ def generate(events, backend, group):
'#define TRACE_%s_GENERATED_TCG_TRACERS_H' % group.upper(),
'',
'#include "exec/helper-proto.h"',
+ '#include "%s"' % header,
'',
)
diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py
index 7dccd8c..ec7acbe 100644
--- a/scripts/tracetool/format/tcg_helper_c.py
+++ b/scripts/tracetool/format/tcg_helper_c.py
@@ -55,6 +55,7 @@ def generate(events, backend, group):
'#include "qemu-common.h"',
'#include "cpu.h"',
'#include "exec/helper-proto.h"',
+ '#include "%s"' % header,
'',
)
--
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-03-28 14:23 [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
2017-03-28 14:23 ` [Qemu-devel] [PULL for-2.9 1/1] trace: fix tcg tracing build breakage Stefan Hajnoczi
@ 2017-03-28 17:37 ` Peter Maydell
1 sibling, 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
* [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
* 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-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-08 13:39 Stefan Hajnoczi
@ 2017-05-08 13:49 ` Stefan Hajnoczi
0 siblings, 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-05-08 13:39 Stefan Hajnoczi
2017-05-08 13:49 ` Stefan Hajnoczi
0 siblings, 1 reply; 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
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-03-28 14:23 [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Stefan Hajnoczi
2017-03-28 14:23 ` [Qemu-devel] [PULL for-2.9 1/1] trace: fix tcg tracing build breakage Stefan Hajnoczi
2017-03-28 17:37 ` [Qemu-devel] [PULL for-2.9 0/1] Tracing patches Peter Maydell
2017-05-08 13:39 Stefan Hajnoczi
2017-05-08 13:49 ` Stefan Hajnoczi
2017-05-12 14:38 Stefan Hajnoczi
2017-05-15 13:39 ` Stefan Hajnoczi
2017-06-07 18:55 Stefan Hajnoczi
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.