Skip to content

Commit

Permalink
trace: switch position of headers to what Meson requires
Browse files Browse the repository at this point in the history 
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 <[email protected]>
  • Loading branch information
@bonzini
bonzini committed Aug 21, 2020
1 parent 22fb2ab commit 243af02
Show file tree
Hide file tree
Showing 96 changed files with 121 additions and 41 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ docker-src.*
*~
*.ast_raw
*.depend_raw
trace.h
trace.c
trace-ust.h
trace-ust.h
Expand Down
46 changes: 28 additions & 18 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 $< $@
Expand All @@ -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 \
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion Makefile.objs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 1 addition & 0 deletions accel/kvm/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-accel_kvm.h"
2 changes: 1 addition & 1 deletion accel/tcg/cputlb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions accel/tcg/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-accel_tcg.h"
2 changes: 1 addition & 1 deletion accel/tcg/user-exec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions audio/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-audio.h"
1 change: 1 addition & 0 deletions authz/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-authz.h"
1 change: 1 addition & 0 deletions backends/tpm/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-backends_tpm.h"
1 change: 1 addition & 0 deletions backends/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-backends.h"
1 change: 1 addition & 0 deletions block/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-block.h"
1 change: 1 addition & 0 deletions chardev/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-chardev.h"
1 change: 1 addition & 0 deletions crypto/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-crypto.h"
2 changes: 1 addition & 1 deletion dma-helpers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion gdbstub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_9pfs.h"
1 change: 1 addition & 0 deletions hw/acpi/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_acpi.h"
1 change: 1 addition & 0 deletions hw/alpha/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_alpha.h"
1 change: 1 addition & 0 deletions hw/arm/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_arm.h"
1 change: 1 addition & 0 deletions hw/audio/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_audio.h"
1 change: 1 addition & 0 deletions hw/block/dataplane/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_block_dataplane.h"
1 change: 1 addition & 0 deletions hw/block/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_block.h"
1 change: 1 addition & 0 deletions hw/char/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_char.h"
2 changes: 1 addition & 1 deletion hw/core/cpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions hw/core/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_core.h"
1 change: 1 addition & 0 deletions hw/display/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_display.h"
1 change: 1 addition & 0 deletions hw/dma/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_dma.h"
1 change: 1 addition & 0 deletions hw/gpio/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_gpio.h"
1 change: 1 addition & 0 deletions hw/hppa/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_hppa.h"
1 change: 1 addition & 0 deletions hw/hyperv/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_hyperv.h"
1 change: 1 addition & 0 deletions hw/i2c/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_i2c.h"
1 change: 1 addition & 0 deletions hw/i386/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_i386.h"
1 change: 1 addition & 0 deletions hw/i386/xen/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_i386_xen.h"
1 change: 1 addition & 0 deletions hw/ide/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_ide.h"
1 change: 1 addition & 0 deletions hw/input/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_input.h"
1 change: 1 addition & 0 deletions hw/intc/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_intc.h"
1 change: 1 addition & 0 deletions hw/isa/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_isa.h"
1 change: 1 addition & 0 deletions hw/mem/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_mem.h"
1 change: 1 addition & 0 deletions hw/mips/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_mips.h"
1 change: 1 addition & 0 deletions hw/misc/macio/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_misc_macio.h"
1 change: 1 addition & 0 deletions hw/misc/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_misc.h"
1 change: 1 addition & 0 deletions hw/net/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_net.h"
1 change: 1 addition & 0 deletions hw/nvram/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_nvram.h"
1 change: 1 addition & 0 deletions hw/pci-host/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_pci_host.h"
1 change: 1 addition & 0 deletions hw/pci/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_pci.h"
1 change: 1 addition & 0 deletions hw/ppc/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_ppc.h"
1 change: 1 addition & 0 deletions hw/rdma/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_rdma.h"
1 change: 1 addition & 0 deletions hw/rdma/vmw/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_rdma_vmw.h"
1 change: 1 addition & 0 deletions hw/riscv/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_riscv.h"
1 change: 1 addition & 0 deletions hw/rtc/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_rtc.h"
1 change: 1 addition & 0 deletions hw/s390x/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_s390x.h"
1 change: 1 addition & 0 deletions hw/scsi/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_scsi.h"
1 change: 1 addition & 0 deletions hw/sd/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_sd.h"
1 change: 1 addition & 0 deletions hw/sparc/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_sparc.h"
1 change: 1 addition & 0 deletions hw/sparc64/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_sparc64.h"
1 change: 1 addition & 0 deletions hw/ssi/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_ssi.h"
1 change: 1 addition & 0 deletions hw/timer/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_timer.h"
1 change: 1 addition & 0 deletions hw/tpm/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_tpm.h"
1 change: 1 addition & 0 deletions hw/usb/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_usb.h"
1 change: 1 addition & 0 deletions hw/vfio/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_vfio.h"
1 change: 1 addition & 0 deletions hw/virtio/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_virtio.h"
1 change: 1 addition & 0 deletions hw/watchdog/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_watchdog.h"
1 change: 1 addition & 0 deletions hw/xen/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-hw_xen.h"
2 changes: 1 addition & 1 deletion include/user/syscall-trace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions io/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-io.h"
2 changes: 1 addition & 1 deletion job-qmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion job.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions linux-user/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-linux_user.h"
1 change: 1 addition & 0 deletions migration/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-migration.h"
1 change: 1 addition & 0 deletions monitor/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-monitor.h"
1 change: 1 addition & 0 deletions nbd/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-nbd.h"
1 change: 1 addition & 0 deletions net/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-net.h"
1 change: 1 addition & 0 deletions qapi/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-qapi.h"
1 change: 1 addition & 0 deletions qom/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-qom.h"
5 changes: 1 addition & 4 deletions scripts/tracetool/format/c.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */',
'',
Expand Down
2 changes: 1 addition & 1 deletion scripts/tracetool/format/tcg_h.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion scripts/tracetool/format/tcg_helper_c.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions scsi/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-scsi.h"
2 changes: 1 addition & 1 deletion softmmu/balloon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion softmmu/ioport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion softmmu/memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion softmmu/vl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions target/arm/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-target_arm.h"
1 change: 1 addition & 0 deletions target/hppa/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-target_hppa.h"
1 change: 1 addition & 0 deletions target/i386/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-target_i386.h"
1 change: 1 addition & 0 deletions target/mips/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-target_mips.h"
1 change: 1 addition & 0 deletions target/ppc/trace.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "trace/trace-target_ppc.h"
Loading

0 comments on commit 243af02

Please sign in to comment.