Commit b8dc35b2 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging 



# gpg: Signature made Tue 28 Mar 2017 15:22:59 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: fix tcg tracing build breakage

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents aba0fb1e 7609ffb9

docs/tracing.txt

+3 −0
Original line number Diff line number Diff line
@@ -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"

scripts/tracetool/format/tcg_h.py

+1 −0
Original line number Diff line number Diff line
@@ -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,

        '',

        )

scripts/tracetool/format/tcg_helper_c.py

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ def generate(events, backend, group): 
        '#include "qemu-common.h"',

        '#include "cpu.h"',

        '#include "exec/helper-proto.h"',

        '#include "%s"' % header,

        '',

        )

trace/Makefile.objs

+8 −8
Original line number Diff line number Diff line
@@ -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,%,$@)")