trace: switch position of headers to what Meson requires

Meson doesn't enjoy the same flexibility we have with Make in choosing
the include path.  In particular the tracing headers are using
$(build_root)/$(<D).

In order to keep the include directives unchanged,
the simplest solution is to generate headers with patterns like
"trace/trace-audio.h" and place forwarding headers in the source tree
such that for example "audio/trace.h" includes "trace/trace-audio.h".

This patch is too ugly to be applied to the Makefiles now.  It's only
a way to separate the changes to the tracing header files from the
Meson rewrite of the tracing logic.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/.gitignore b/.gitignore
index 2992d15931ac7f3dae9f67f9570ba9f9515b5e19..656e39050b42ea299277a12824d8dc7b885299e7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -146,7 +146,6 @@ docker-src.*
 *~
 *.ast_raw
 *.depend_raw
-trace.h
 trace.c
 trace-ust.h
 trace-ust.h

diff --git a/Makefile b/Makefile
index 13dd708c4af52df3bc932812fc60008809191927..00cadebf994be85ab10c7d63a77e7515ee975082 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -159,8 +159,8 @@ generated-files-$(CONFIG_TRACE_UST) += trace-ust-all.c
 
 generated-files-y += module_block.h
 
-TRACE_HEADERS = trace-root.h $(trace-events-subdirs:%=%/trace.h)
-TRACE_SOURCES = trace-root.c $(trace-events-subdirs:%=%/trace.c)
+TRACE_HEADERS = trace/trace-root.h
+TRACE_SOURCES = trace/trace-root.c
 TRACE_DTRACE =
 ifdef CONFIG_TRACE_DTRACE
 TRACE_HEADERS += trace-dtrace-root.h $(trace-events-subdirs:%=%/trace-dtrace.h)
@@ -170,33 +170,37 @@ ifdef CONFIG_TRACE_UST
 TRACE_HEADERS += trace-ust-root.h $(trace-events-subdirs:%=%/trace-ust.h)
 endif
 
-generated-files-y += $(TRACE_HEADERS)
-generated-files-y += $(TRACE_SOURCES)
 generated-files-y += $(BUILD_DIR)/trace-events-all
 generated-files-y += .git-submodule-status
 
 trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
+trace-group-suffix = $(shell echo $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
 
 tracetool-y = $(SRC_PATH)/scripts/tracetool.py
 tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
 
-%/trace.h: %/trace.h-timestamp
-       @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-%/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+define __trace_rules
+TRACE_HEADERS += trace/trace-$2.h
+TRACE_SOURCES += trace/trace-$2.c
+trace-obj-y += trace/trace-$2.o
+trace/trace-$2.h: trace/trace-$2.h-timestamp
+       @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@
+trace/trace-$2.h-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
        $(call quiet-command,$(TRACETOOL) \
-               --group=$(call trace-group-name,$@) \
+               --group=$2 \
                --format=h \
                --backends=$(TRACE_BACKENDS) \
-               $< > $@,"GEN","$(@:%-timestamp=%)")
+               $$< > $$@,"GEN","$$(@:%-timestamp=%)")
 
-%/trace.c: %/trace.c-timestamp
-       @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-%/trace.c-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/trace-$2.c: trace/trace-$2.c-timestamp
+       @cmp $$< $$@ >/dev/null 2>&1 || cp $$< $$@
+trace/trace-$2.c-timestamp: $(SRC_PATH)/$1/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
        $(call quiet-command,$(TRACETOOL) \
-               --group=$(call trace-group-name,$@) \
+               --group=$2 \
                --format=c \
                --backends=$(TRACE_BACKENDS) \
-               $< > $@,"GEN","$(@:%-timestamp=%)")
+               $$< > $$@,"GEN","$$(@:%-timestamp=%)")
+endef
 
 %/trace-ust.h: %/trace-ust.h-timestamp
        @cmp $< $@ >/dev/null 2>&1 || cp $< $@
@@ -222,18 +226,18 @@ tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
 %/trace-dtrace.o: %/trace-dtrace.dtrace $(tracetool-y)
 
 
-trace-root.h: trace-root.h-timestamp
+trace/trace-root.h: trace/trace-root.h-timestamp
        @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
        $(call quiet-command,$(TRACETOOL) \
                --group=root \
                --format=h \
                --backends=$(TRACE_BACKENDS) \
                $< > $@,"GEN","$(@:%-timestamp=%)")
 
-trace-root.c: trace-root.c-timestamp
+trace/trace-root.c: trace/trace-root.c-timestamp
        @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
+trace/trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_DIR)/config-host.mak
        $(call quiet-command,$(TRACETOOL) \
                --group=root \
                --format=c \
@@ -477,6 +481,12 @@ dummy := $(call unnest-vars,, \
                 common-obj-m \
                 trace-obj-y)
 
+dummy := $(foreach DIR,$(trace-events-subdirs),$(eval $(call __trace_rules,$(DIR),$(call trace-group-suffix,$(DIR)))))
+
+generated-files-y += $(TRACE_HEADERS)
+generated-files-y += $(TRACE_SOURCES)
+
+
 include $(SRC_PATH)/tests/Makefile.include
 
 all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules $(vhost-user-json-y)

diff --git a/Makefile.objs b/Makefile.objs
index d22b3b45d7b6952965c2dc3599a60e33b2edf61f..3823463c2337c9b4181d77813fa8f58ebdf2d41e 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -209,7 +209,6 @@ trace-events-subdirs += util
 trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)
 
 trace-obj-y = trace-root.o
-trace-obj-y += $(trace-events-subdirs:%=%/trace.o)
 trace-obj-$(CONFIG_TRACE_UST) += trace-ust-all.o
 trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace-root.o
 trace-obj-$(CONFIG_TRACE_DTRACE) += $(trace-events-subdirs:%=%/trace-dtrace.o)

diff --git a/accel/kvm/trace.h b/accel/kvm/trace.h
new file mode 100644 (file)
index 0000000..67c935a
--- /dev/null
+++ b/accel/kvm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-accel_kvm.h"

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 56982927490c15f5834be2eb7ca71e04d787cf96..5349ee6b0e0df11e8923f4c6b08efd2293370159 100644 (file)
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -34,7 +34,7 @@
 #include "qemu/atomic.h"
 #include "qemu/atomic128.h"
 #include "translate-all.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "trace/mem.h"
 #ifdef CONFIG_PLUGIN
 #include "qemu/plugin-memory.h"

diff --git a/accel/tcg/trace.h b/accel/tcg/trace.h
new file mode 100644 (file)
index 0000000..db61fad
--- /dev/null
+++ b/accel/tcg/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-accel_tcg.h"

diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index d8b027f8c15fae4e925c4e0cc8721d670b290c5c..1d34c57ff5c75c21a4ee24f547dd29ca313c4a7d 100644 (file)
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -26,7 +26,7 @@
 #include "translate-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/atomic128.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "trace/mem.h"
 
 #undef EAX

diff --git a/audio/trace.h b/audio/trace.h
new file mode 100644 (file)
index 0000000..4072a11
--- /dev/null
+++ b/audio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-audio.h"

diff --git a/authz/trace.h b/authz/trace.h
new file mode 100644 (file)
index 0000000..3176c12
--- /dev/null
+++ b/authz/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-authz.h"

diff --git a/backends/tpm/trace.h b/backends/tpm/trace.h
new file mode 100644 (file)
index 0000000..40c4729
--- /dev/null
+++ b/backends/tpm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-backends_tpm.h"

diff --git a/backends/trace.h b/backends/trace.h
new file mode 100644 (file)
index 0000000..77fe57f
--- /dev/null
+++ b/backends/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-backends.h"

diff --git a/block/trace.h b/block/trace.h
new file mode 100644 (file)
index 0000000..3a436e6
--- /dev/null
+++ b/block/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-block.h"

diff --git a/chardev/trace.h b/chardev/trace.h
new file mode 100644 (file)
index 0000000..eb4f902
--- /dev/null
+++ b/chardev/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-chardev.h"

diff --git a/crypto/trace.h b/crypto/trace.h
new file mode 100644 (file)
index 0000000..a9af0f3
--- /dev/null
+++ b/crypto/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-crypto.h"

diff --git a/dma-helpers.c b/dma-helpers.c
index 2a77b5a9cb5e0822350fcaae77c016239c07cd7b..41ef24a63b6b077022fd329b528dac9cc19ead70 100644 (file)
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "qemu/thread.h"
 #include "qemu/main-loop.h"
 #include "sysemu/cpus.h"

diff --git a/exec.c b/exec.c
index 6f381f98e2a01c432c28c0c094db536c8a24afa3..8047bf2ff923a8e254e407dc11e6fd62e5c2995b 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -50,7 +50,7 @@
 #include "sysemu/hw_accel.h"
 #include "exec/address-spaces.h"
 #include "sysemu/xen-mapcache.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 
 #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
 #include <linux/falloc.h>

diff --git a/gdbstub.c b/gdbstub.c
index f3a318cd7ffb7af00037f978b5753d4e519824dd..9dfb6e4142cb5b8f2c44ae79c9758b3b568d05a2 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -30,7 +30,7 @@
 #include "qemu/ctype.h"
 #include "qemu/cutils.h"
 #include "qemu/module.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #ifdef CONFIG_USER_ONLY
 #include "qemu.h"
 #else

diff --git a/hw/9pfs/trace.h b/hw/9pfs/trace.h
new file mode 100644 (file)
index 0000000..6104fe2
--- /dev/null
+++ b/hw/9pfs/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_9pfs.h"

diff --git a/hw/acpi/trace.h b/hw/acpi/trace.h
new file mode 100644 (file)
index 0000000..a7f7da7
--- /dev/null
+++ b/hw/acpi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_acpi.h"

diff --git a/hw/alpha/trace.h b/hw/alpha/trace.h
new file mode 100644 (file)
index 0000000..20fe698
--- /dev/null
+++ b/hw/alpha/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_alpha.h"

diff --git a/hw/arm/trace.h b/hw/arm/trace.h
new file mode 100644 (file)
index 0000000..91337aa
--- /dev/null
+++ b/hw/arm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_arm.h"

diff --git a/hw/audio/trace.h b/hw/audio/trace.h
new file mode 100644 (file)
index 0000000..5c7516a
--- /dev/null
+++ b/hw/audio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_audio.h"

diff --git a/hw/block/dataplane/trace.h b/hw/block/dataplane/trace.h
new file mode 100644 (file)
index 0000000..240cc59
--- /dev/null
+++ b/hw/block/dataplane/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_block_dataplane.h"

diff --git a/hw/block/trace.h b/hw/block/trace.h
new file mode 100644 (file)
index 0000000..cde210a
--- /dev/null
+++ b/hw/block/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_block.h"

diff --git a/hw/char/trace.h b/hw/char/trace.h
new file mode 100644 (file)
index 0000000..c2df66a
--- /dev/null
+++ b/hw/char/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_char.h"

diff --git a/hw/core/cpu.c b/hw/core/cpu.c
index 594441a150c2feb00aab0c248c9ab175003638e9..22bc3f974a2f9188d8f57940905b98d1ee3ec0c2 100644 (file)
--- a/hw/core/cpu.c
+++ b/hw/core/cpu.c
@@ -31,7 +31,7 @@
 #include "sysemu/tcg.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "qemu/plugin.h"
 
 CPUInterruptHandler cpu_interrupt_handler;

diff --git a/hw/core/trace.h b/hw/core/trace.h
new file mode 100644 (file)
index 0000000..23dfd61
--- /dev/null
+++ b/hw/core/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_core.h"

diff --git a/hw/display/trace.h b/hw/display/trace.h
new file mode 100644 (file)
index 0000000..4ed0e91
--- /dev/null
+++ b/hw/display/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_display.h"

diff --git a/hw/dma/trace.h b/hw/dma/trace.h
new file mode 100644 (file)
index 0000000..4bcb28b
--- /dev/null
+++ b/hw/dma/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_dma.h"

diff --git a/hw/gpio/trace.h b/hw/gpio/trace.h
new file mode 100644 (file)
index 0000000..8b13907
--- /dev/null
+++ b/hw/gpio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_gpio.h"

diff --git a/hw/hppa/trace.h b/hw/hppa/trace.h
new file mode 100644 (file)
index 0000000..4e8b52d
--- /dev/null
+++ b/hw/hppa/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_hppa.h"

diff --git a/hw/hyperv/trace.h b/hw/hyperv/trace.h
new file mode 100644 (file)
index 0000000..7f2a888
--- /dev/null
+++ b/hw/hyperv/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_hyperv.h"

diff --git a/hw/i2c/trace.h b/hw/i2c/trace.h
new file mode 100644 (file)
index 0000000..4843a8d
--- /dev/null
+++ b/hw/i2c/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_i2c.h"

diff --git a/hw/i386/trace.h b/hw/i386/trace.h
new file mode 100644 (file)
index 0000000..37a9f67
--- /dev/null
+++ b/hw/i386/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_i386.h"

diff --git a/hw/i386/xen/trace.h b/hw/i386/xen/trace.h
new file mode 100644 (file)
index 0000000..a02bf75
--- /dev/null
+++ b/hw/i386/xen/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_i386_xen.h"

diff --git a/hw/ide/trace.h b/hw/ide/trace.h
new file mode 100644 (file)
index 0000000..e060e0a
--- /dev/null
+++ b/hw/ide/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ide.h"

diff --git a/hw/input/trace.h b/hw/input/trace.h
new file mode 100644 (file)
index 0000000..d1cc5d9
--- /dev/null
+++ b/hw/input/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_input.h"

diff --git a/hw/intc/trace.h b/hw/intc/trace.h
new file mode 100644 (file)
index 0000000..02394ae
--- /dev/null
+++ b/hw/intc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_intc.h"

diff --git a/hw/isa/trace.h b/hw/isa/trace.h
new file mode 100644 (file)
index 0000000..501205c
--- /dev/null
+++ b/hw/isa/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_isa.h"

diff --git a/hw/mem/trace.h b/hw/mem/trace.h
new file mode 100644 (file)
index 0000000..2f2c945
--- /dev/null
+++ b/hw/mem/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_mem.h"

diff --git a/hw/mips/trace.h b/hw/mips/trace.h
new file mode 100644 (file)
index 0000000..8d1fd7c
--- /dev/null
+++ b/hw/mips/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_mips.h"

diff --git a/hw/misc/macio/trace.h b/hw/misc/macio/trace.h
new file mode 100644 (file)
index 0000000..34a3cf1
--- /dev/null
+++ b/hw/misc/macio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_misc_macio.h"

diff --git a/hw/misc/trace.h b/hw/misc/trace.h
new file mode 100644 (file)
index 0000000..1ab6923
--- /dev/null
+++ b/hw/misc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_misc.h"

diff --git a/hw/net/trace.h b/hw/net/trace.h
new file mode 100644 (file)
index 0000000..93249af
--- /dev/null
+++ b/hw/net/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_net.h"

diff --git a/hw/nvram/trace.h b/hw/nvram/trace.h
new file mode 100644 (file)
index 0000000..88fa900
--- /dev/null
+++ b/hw/nvram/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_nvram.h"

diff --git a/hw/pci-host/trace.h b/hw/pci-host/trace.h
new file mode 100644 (file)
index 0000000..93ec814
--- /dev/null
+++ b/hw/pci-host/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_pci_host.h"

diff --git a/hw/pci/trace.h b/hw/pci/trace.h
new file mode 100644 (file)
index 0000000..3dd773e
--- /dev/null
+++ b/hw/pci/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_pci.h"

diff --git a/hw/ppc/trace.h b/hw/ppc/trace.h
new file mode 100644 (file)
index 0000000..87c4198
--- /dev/null
+++ b/hw/ppc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ppc.h"

diff --git a/hw/rdma/trace.h b/hw/rdma/trace.h
new file mode 100644 (file)
index 0000000..b3fa8eb
--- /dev/null
+++ b/hw/rdma/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_rdma.h"

diff --git a/hw/rdma/vmw/trace.h b/hw/rdma/vmw/trace.h
new file mode 100644 (file)
index 0000000..3ebc9fb
--- /dev/null
+++ b/hw/rdma/vmw/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_rdma_vmw.h"

diff --git a/hw/riscv/trace.h b/hw/riscv/trace.h
new file mode 100644 (file)
index 0000000..8c0e3ca
--- /dev/null
+++ b/hw/riscv/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_riscv.h"

diff --git a/hw/rtc/trace.h b/hw/rtc/trace.h
new file mode 100644 (file)
index 0000000..cfd5d6e
--- /dev/null
+++ b/hw/rtc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_rtc.h"

diff --git a/hw/s390x/trace.h b/hw/s390x/trace.h
new file mode 100644 (file)
index 0000000..d6568b3
--- /dev/null
+++ b/hw/s390x/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_s390x.h"

diff --git a/hw/scsi/trace.h b/hw/scsi/trace.h
new file mode 100644 (file)
index 0000000..4ce2673
--- /dev/null
+++ b/hw/scsi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_scsi.h"

diff --git a/hw/sd/trace.h b/hw/sd/trace.h
new file mode 100644 (file)
index 0000000..f3d0c58
--- /dev/null
+++ b/hw/sd/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_sd.h"

diff --git a/hw/sparc/trace.h b/hw/sparc/trace.h
new file mode 100644 (file)
index 0000000..625d60c
--- /dev/null
+++ b/hw/sparc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_sparc.h"

diff --git a/hw/sparc64/trace.h b/hw/sparc64/trace.h
new file mode 100644 (file)
index 0000000..b6ef6e6
--- /dev/null
+++ b/hw/sparc64/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_sparc64.h"

diff --git a/hw/ssi/trace.h b/hw/ssi/trace.h
new file mode 100644 (file)
index 0000000..0c1de26
--- /dev/null
+++ b/hw/ssi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ssi.h"

diff --git a/hw/timer/trace.h b/hw/timer/trace.h
new file mode 100644 (file)
index 0000000..5f72c44
--- /dev/null
+++ b/hw/timer/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_timer.h"

diff --git a/hw/tpm/trace.h b/hw/tpm/trace.h
new file mode 100644 (file)
index 0000000..9827c12
--- /dev/null
+++ b/hw/tpm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_tpm.h"

diff --git a/hw/usb/trace.h b/hw/usb/trace.h
new file mode 100644 (file)
index 0000000..f3962f2
--- /dev/null
+++ b/hw/usb/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_usb.h"

diff --git a/hw/vfio/trace.h b/hw/vfio/trace.h
new file mode 100644 (file)
index 0000000..5a343aa
--- /dev/null
+++ b/hw/vfio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_vfio.h"

diff --git a/hw/virtio/trace.h b/hw/virtio/trace.h
new file mode 100644 (file)
index 0000000..5d70970
--- /dev/null
+++ b/hw/virtio/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_virtio.h"

diff --git a/hw/watchdog/trace.h b/hw/watchdog/trace.h
new file mode 100644 (file)
index 0000000..5d84957
--- /dev/null
+++ b/hw/watchdog/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_watchdog.h"

diff --git a/hw/xen/trace.h b/hw/xen/trace.h
new file mode 100644 (file)
index 0000000..adba31a
--- /dev/null
+++ b/hw/xen/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_xen.h"

diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h
index 79fd3e5aa9c95ba44fed85118aa5e453607c54f2..42e3b48b032f4dfc0d9c3ae66885289ef0824e62 100644 (file)
--- a/include/user/syscall-trace.h
+++ b/include/user/syscall-trace.h
@@ -10,7 +10,7 @@
 #ifndef _SYSCALL_TRACE_H_
 #define _SYSCALL_TRACE_H_
 
-#include "trace-root.h"
+#include "trace/trace-root.h"
 
 /*
  * These helpers just provide a common place for the various

diff --git a/io/trace.h b/io/trace.h
new file mode 100644 (file)
index 0000000..92d63a5
--- /dev/null
+++ b/io/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-io.h"

diff --git a/job-qmp.c b/job-qmp.c
index f9a58832e164bdd8a181c73fc618f2f5dc69d5c8..645601b2ccc1873b5fae2d97dbd8c34a68d42c90 100644 (file)
--- a/job-qmp.c
+++ b/job-qmp.c
@@ -27,7 +27,7 @@
 #include "qemu/job.h"
 #include "qapi/qapi-commands-job.h"
 #include "qapi/error.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 
 /* Get a job using its ID and acquire its AioContext */
 static Job *find_job(const char *id, AioContext **aio_context, Error **errp)

diff --git a/job.c b/job.c
index 53be57a3a0b6d57d21e327d12a75acdfba40c67d..8fecf389609fe09c5f87d001ac7c83af5cde92d9 100644 (file)
--- a/job.c
+++ b/job.c
@@ -29,7 +29,7 @@
 #include "qemu/id.h"
 #include "qemu/main-loop.h"
 #include "block/aio-wait.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "qapi/qapi-events-job.h"
 
 static QLIST_HEAD(, Job) jobs = QLIST_HEAD_INITIALIZER(jobs);

diff --git a/linux-user/trace.h b/linux-user/trace.h
new file mode 100644 (file)
index 0000000..05518e4
--- /dev/null
+++ b/linux-user/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-linux_user.h"

diff --git a/migration/trace.h b/migration/trace.h
new file mode 100644 (file)
index 0000000..e1a0f4f
--- /dev/null
+++ b/migration/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-migration.h"

diff --git a/monitor/trace.h b/monitor/trace.h
new file mode 100644 (file)
index 0000000..f216e31
--- /dev/null
+++ b/monitor/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-monitor.h"

diff --git a/nbd/trace.h b/nbd/trace.h
new file mode 100644 (file)
index 0000000..233d08f
--- /dev/null
+++ b/nbd/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-nbd.h"

diff --git a/net/trace.h b/net/trace.h
new file mode 100644 (file)
index 0000000..18d42c2
--- /dev/null
+++ b/net/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-net.h"

diff --git a/qapi/trace.h b/qapi/trace.h
new file mode 100644 (file)
index 0000000..5c3fb67
--- /dev/null
+++ b/qapi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-qapi.h"

diff --git a/qom/trace.h b/qom/trace.h
new file mode 100644 (file)
index 0000000..f2895e6
--- /dev/null
+++ b/qom/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-qom.h"

diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py
index 23d82ea861aa3edc6949f086db65f22c06bfa471..c390c1844af6d717d7c718bd8aaf268f7c4f9f74 100644 (file)
--- a/scripts/tracetool/format/c.py
+++ b/scripts/tracetool/format/c.py
@@ -19,10 +19,7 @@ def generate(events, backend, group):
     active_events = [e for e in events
                      if "disable" not in e.properties]
 
-    if group == "root":
-        header = "trace-root.h"
-    else:
-        header = "trace.h"
+    header = "trace-" + group + ".h"
 
     out('/* This file is autogenerated by tracetool, do not edit. */',
         '',

diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py
index 33cf6a31b320c1d37898572d28c2bf0e1871987b..4d84440aff866603d0d2c6d195f4dad1f6fa99f9 100644 (file)
--- a/scripts/tracetool/format/tcg_h.py
+++ b/scripts/tracetool/format/tcg_h.py
@@ -28,7 +28,7 @@ def vcpu_transform_args(args):
 
 def generate(events, backend, group):
     if group == "root":
-        header = "trace-root.h"
+        header = "trace/trace-root.h"
     else:
         header = "trace.h"
 

diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py
index 2db6317f3cd0e4fa3492863bccc6ddca44f02674..72576e67d1939e616e580738f8116cd89082f543 100644 (file)
--- a/scripts/tracetool/format/tcg_helper_c.py
+++ b/scripts/tracetool/format/tcg_helper_c.py
@@ -41,7 +41,7 @@ def vcpu_transform_args(args, mode):
 
 def generate(events, backend, group):
     if group == "root":
-        header = "trace-root.h"
+        header = "trace/trace-root.h"
     else:
         header = "trace.h"
 

diff --git a/scsi/trace.h b/scsi/trace.h
new file mode 100644 (file)
index 0000000..3e4d89a
--- /dev/null
+++ b/scsi/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-scsi.h"

diff --git a/softmmu/balloon.c b/softmmu/balloon.c
index 354408c6eab7d2752d646033cbe306f5301e7b3b..b89646f85d5d90574a9fb4434f6064d363d56b55 100644 (file)
--- a/softmmu/balloon.c
+++ b/softmmu/balloon.c
@@ -28,7 +28,7 @@
 #include "qemu/atomic.h"
 #include "sysemu/kvm.h"
 #include "sysemu/balloon.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/qmp/qerror.h"

diff --git a/softmmu/ioport.c b/softmmu/ioport.c
index 04e360e79a3dfdcaa51f1ae796967d4be9decddd..a799697c5dcf967c2b0c140dfd2fbac48472f4c9 100644 (file)
--- a/softmmu/ioport.c
+++ b/softmmu/ioport.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/ioport.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 

diff --git a/softmmu/memory.c b/softmmu/memory.c
index af259875183a4b0a5121b2f024dc8e9477709805..70b93104e8cc33e36eddfe53b3fd5fe942bf6164 100644 (file)
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -24,7 +24,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/qemu-print.h"
 #include "qom/object.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 4eb9d1f7fd54f27583bfb1ce94072e1a1d9710d7..0cc86b076685b31ccf9de06b1c33453427ae9b8d 100644 (file)
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -90,7 +90,7 @@
 
 #include "disas/disas.h"
 
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "trace/control.h"
 #include "qemu/plugin.h"
 #include "qemu/queue.h"

diff --git a/target/arm/trace.h b/target/arm/trace.h
new file mode 100644 (file)
index 0000000..60372d8
--- /dev/null
+++ b/target/arm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_arm.h"

diff --git a/target/hppa/trace.h b/target/hppa/trace.h
new file mode 100644 (file)
index 0000000..810cc09
--- /dev/null
+++ b/target/hppa/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_hppa.h"

diff --git a/target/i386/trace.h b/target/i386/trace.h
new file mode 100644 (file)
index 0000000..781e8ec
--- /dev/null
+++ b/target/i386/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_i386.h"

diff --git a/target/mips/trace.h b/target/mips/trace.h
new file mode 100644 (file)
index 0000000..f25b88c
--- /dev/null
+++ b/target/mips/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_mips.h"

diff --git a/target/ppc/trace.h b/target/ppc/trace.h
new file mode 100644 (file)
index 0000000..a9e8962
--- /dev/null
+++ b/target/ppc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_ppc.h"

diff --git a/target/riscv/trace.h b/target/riscv/trace.h
new file mode 100644 (file)
index 0000000..03a89fc
--- /dev/null
+++ b/target/riscv/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_riscv.h"

diff --git a/target/s390x/trace.h b/target/s390x/trace.h
new file mode 100644 (file)
index 0000000..d7d59d4
--- /dev/null
+++ b/target/s390x/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_s390x.h"

diff --git a/target/sparc/trace.h b/target/sparc/trace.h
new file mode 100644 (file)
index 0000000..3b2f5a8
--- /dev/null
+++ b/target/sparc/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_sparc.h"

diff --git a/trace/control-target.c b/trace/control-target.c
index ceb55c70ce8377b02d833b0ce6fe5ac2c8e35e10..e293eeed7c00120bf6983ca6c54275308920480f 100644 (file)
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 #include "trace/control.h"
 
 

diff --git a/trace/control.c b/trace/control.c
index 6558b5c906d1c262e3fe8a91ec2e8e720b52f6b8..c63a4de732bf19dd8ecbe8b83566c66d0aa0ab22 100644 (file)
--- a/trace/control.c
+++ b/trace/control.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"
 #include "monitor/monitor.h"
-#include "trace-root.h"
+#include "trace/trace-root.h"
 
 int trace_events_enabled_count;
 

diff --git a/ui/trace.h b/ui/trace.h
new file mode 100644 (file)
index 0000000..a89d769
--- /dev/null
+++ b/ui/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-ui.h"

diff --git a/util/trace.h b/util/trace.h
new file mode 100644 (file)
index 0000000..86ff7a3
--- /dev/null
+++ b/util/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-util.h"