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

[qemu.git] / trace / Makefile.objs

diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index dde9d5784e6003df216210b6182d110506af3800..c544509adf8886a93a15de5c45d86635722e1583 100644 (file)
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -1,58 +1,59 @@
 # -*- mode: makefile -*-
 
-######################################################################
-# Auto-generated header for tracing routines
+$(BUILD_DIR)/trace-events-all: $(trace-events-files)
+       $(call quiet-command,cat $^ > $@)
 
-$(obj)/generated-tracers.h: $(obj)/generated-tracers.h-timestamp
-       @cmp -s $< $@ || cp $< $@
-$(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
-       $(call quiet-command,$(TRACETOOL) \
-               --format=h \
-               --backend=$(TRACE_BACKEND) \
-               < $< > $@,"  GEN   $(patsubst %-timestamp,%,$@)")
 
-######################################################################
-# Auto-generated tracing routines (non-DTrace)
+##################################################
+# Translation level
 
-ifneq ($(TRACE_BACKEND),dtrace)
-$(obj)/generated-tracers.c: $(obj)/generated-tracers.c-timestamp
-       @cmp -s $< $@ || cp $< $@
-$(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
+$(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp
+       @cmp $< $@ >/dev/null 2>&1 || cp $< $@
+$(obj)/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+       $(call quiet-command,$(TRACETOOL) \
+               --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: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
        $(call quiet-command,$(TRACETOOL) \
-               --format=c \
-               --backend=$(TRACE_BACKEND) \
-               < $< > $@,"  GEN   $(patsubst %-timestamp,%,$@)")
+               --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: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+       $(call quiet-command,$(TRACETOOL) \
+               --group=root \
+               --format=tcg-helper-c \
+               --backend=$(TRACE_BACKENDS) \
+               $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
 
-$(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.h
-endif
+$(obj)/generated-helpers.o: $(obj)/generated-helpers.c
 
+obj-y += generated-helpers.o
 
-######################################################################
-# Auto-generated DTrace code
-
-# Normal practice is to name DTrace probe file with a '.d' extension
-# but that gets picked up by QEMU's Makefile as an external dependency
-# rule file. So we use '.dtrace' instead
-ifeq ($(TRACE_BACKEND),dtrace)
-$(obj)/generated-tracers.dtrace: $(obj)/generated-tracers.dtrace-timestamp
-$(obj)/generated-tracers.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
-       $(call quiet-command,$(TRACETOOL) \
-               --format=d \
-               --backend=$(TRACE_BACKEND) \
-               < $< > $@,"  GEN   $(patsubst %-timestamp,%,$@)")
-       @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
 
-$(obj)/generated-tracers-dtrace.h: $(obj)/generated-tracers.dtrace
-       $(call quiet-command,dtrace -o $@ -h -s $<, "  GEN   $@")
+$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
+       @cmp $< $@ >/dev/null 2>&1 || cp $< $@
+$(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
+       $(call quiet-command,$(TRACETOOL) \
+               --group=root \
+               --format=tcg-h \
+               --backend=$(TRACE_BACKENDS) \
+               $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
 
-$(obj)/generated-tracers.o: $(obj)/generated-tracers.dtrace
-endif
 
 ######################################################################
 # Backend code
 
-util-obj-$(CONFIG_TRACE_DEFAULT) += default.o
 util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
-util-obj-$(CONFIG_TRACE_STDERR) += stderr.o
+util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o
 util-obj-y += control.o
-util-obj-y += generated-tracers.o
+obj-y += control-target.o
+util-obj-y += qmp.o