Commit 4e9f5244 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 Wed 01 Feb 2017 13:44:32 GMT
# 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: clean up trace-events files
  qapi: add missing trace_visit_type_enum() call
  trace: improve error reporting when parsing simpletrace header
  trace: update docs to reflect new code generation approach
  trace: switch to modular code generation for sub-directories
  trace: move setting of group name into Makefiles
  trace: move hw/i386/xen events to correct subdir
  trace: move hw/xen events to correct subdir
  trace: move hw/block/dataplane events to correct subdir
  make: move top level dir to end of include search path

# Conflicts:
#	Makefile

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0b17d809 7f4076c1

.gitignore

+16 −6
Original line number Diff line number Diff line
@@ -6,18 +6,12 @@ 
/config.status

/config-temp

/trace-events-all

/trace/generated-tracers.h

/trace/generated-tracers.c

/trace/generated-tracers-dtrace.h

/trace/generated-tracers.dtrace

/trace/generated-events.h

/trace/generated-events.c

/trace/generated-helpers-wrappers.h

/trace/generated-helpers.h

/trace/generated-helpers.c

/trace/generated-tcg-tracers.h

/trace/generated-ust-provider.h

/trace/generated-ust.c

/ui/shader/texture-blit-frag.h

/ui/shader/texture-blit-vert.h

*-timestamp
@@ -120,3 +114,19 @@ tags 
TAGS

docker-src.*

*~

trace.h

trace.c

trace-ust.h

trace-ust.h

trace-dtrace.h

trace-dtrace.dtrace

trace-root.h

trace-root.c

trace-ust-root.h

trace-ust-root.h

trace-ust-all.h

trace-ust-all.c

trace-dtrace-root.h

trace-dtrace-root.dtrace

trace-ust-all.h

trace-ust-all.c

Makefile

+137 −19
Original line number Diff line number Diff line
@@ -56,25 +56,136 @@ GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c 
GENERATED_HEADERS += qmp-introspect.h

GENERATED_SOURCES += qmp-introspect.c



GENERATED_HEADERS += trace/generated-tracers.h

ifeq ($(findstring dtrace,$(TRACE_BACKENDS)),dtrace)

GENERATED_HEADERS += trace/generated-tracers-dtrace.h

endif

GENERATED_SOURCES += trace/generated-tracers.c



GENERATED_HEADERS += trace/generated-tcg-tracers.h



GENERATED_HEADERS += trace/generated-helpers-wrappers.h

GENERATED_HEADERS += trace/generated-helpers.h

GENERATED_SOURCES += trace/generated-helpers.c



ifeq ($(findstring ust,$(TRACE_BACKENDS)),ust)

GENERATED_HEADERS += trace/generated-ust-provider.h

GENERATED_SOURCES += trace/generated-ust.c

ifdef CONFIG_TRACE_UST

GENERATED_HEADERS += trace-ust-all.h

GENERATED_SOURCES += trace-ust-all.c

endif



GENERATED_HEADERS += module_block.h



TRACE_HEADERS = trace-root.h $(trace-events-subdirs:%=%/trace.h)

TRACE_SOURCES = trace-root.c $(trace-events-subdirs:%=%/trace.c)

TRACE_DTRACE =

ifdef CONFIG_TRACE_DTRACE

TRACE_HEADERS += trace-dtrace-root.h $(trace-events-subdirs:%=%/trace-dtrace.h)

TRACE_DTRACE += trace-dtrace-root.dtrace $(trace-events-subdirs:%=%/trace-dtrace.dtrace)

endif

ifdef CONFIG_TRACE_UST

TRACE_HEADERS += trace-ust-root.h $(trace-events-subdirs:%=%/trace-ust.h)

endif



GENERATED_HEADERS += $(TRACE_HEADERS)

GENERATED_SOURCES += $(TRACE_SOURCES)



trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')



%/trace.h: %/trace.h-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

%/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=$(call trace-group-name,$@) \

		--format=h \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



%/trace.c: %/trace.c-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

%/trace.c-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=$(call trace-group-name,$@) \

		--format=c \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



%/trace-ust.h: %/trace-ust.h-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

%/trace-ust.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=$(call trace-group-name,$@) \

		--format=ust-events-h \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



%/trace-dtrace.dtrace: %/trace-dtrace.dtrace-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

%/trace-dtrace.dtrace-timestamp: $(SRC_PATH)/%/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=$(call trace-group-name,$@) \

		--format=d \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



%/trace-dtrace.h: %/trace-dtrace.dtrace $(tracetool-y)

	$(call quiet-command,dtrace -o $@ -h -s $<, "GEN","$@")



%/trace-dtrace.o: %/trace-dtrace.dtrace $(tracetool-y)





trace-root.h: trace-root.h-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=root \

		--format=h \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



trace-root.c: trace-root.c-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=root \

		--format=c \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



trace-ust-root.h: trace-ust-root.h-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

trace-ust-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=root \

		--format=ust-events-h \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



trace-ust-all.h: trace-ust-all.h-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

trace-ust-all.h-timestamp: $(trace-events-files) $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=all \

		--format=ust-events-h \

		--backends=$(TRACE_BACKENDS) \

		$(trace-events-files) > $@,"GEN","$(@:%-timestamp=%)")



trace-ust-all.c: trace-ust-all.c-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

trace-ust-all.c-timestamp: $(trace-events-files) $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=all \

		--format=ust-events-c \

		--backends=$(TRACE_BACKENDS) \

		$(trace-events-files) > $@,"GEN","$(@:%-timestamp=%)")



trace-dtrace-root.dtrace: trace-dtrace-root.dtrace-timestamp

	@cmp $< $@ >/dev/null 2>&1 || cp $< $@

trace-dtrace-root.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)

	$(call quiet-command,$(TRACETOOL) \

		--group=root \

		--format=d \

		--backends=$(TRACE_BACKENDS) \

		$< > $@,"GEN","$(@:%-timestamp=%)")



trace-dtrace-root.h: trace-dtrace-root.dtrace

	$(call quiet-command,dtrace -o $@ -h -s $<, "GEN","$@")



trace-dtrace-root.o: trace-dtrace-root.dtrace



# Don't try to regenerate Makefile or configure

# We don't generate any of them

Makefile: ;
@@ -161,7 +272,8 @@ dummy := $(call unnest-vars,, \ 
                qom-obj-y \

                io-obj-y \

                common-obj-y \

                common-obj-m)

                common-obj-m \

                trace-obj-y)



ifneq ($(wildcard config-host.mak),)

include $(SRC_PATH)/tests/Makefile.include
@@ -225,7 +337,7 @@ dtc/%: 
	mkdir -p $@



$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj-y) \

	$(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))

	$(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) $(trace-obj-y)



ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))

# Only keep -O and -g cflags
@@ -249,15 +361,17 @@ libqemuutil.a: $(util-obj-y) 


######################################################################



COMMON_LDADDS = $(trace-obj-y) libqemuutil.a libqemustub.a



qemu-img.o: qemu-img-cmds.h



qemu-img$(EXESUF): qemu-img.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a

qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a

qemu-io$(EXESUF): qemu-io.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a

qemu-img$(EXESUF): qemu-img.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)

qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)

qemu-io$(EXESUF): qemu-io.o $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)



qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o libqemuutil.a libqemustub.a

qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS)



fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o libqemuutil.a libqemustub.a

fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS)

fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap



qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
@@ -322,7 +436,7 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py) 
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)

$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)



qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a

qemu-ga$(EXESUF): $(qga-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)



ifdef QEMU_GA_MSI_ENABLED
@@ -347,9 +461,9 @@ ifneq ($(EXESUF),) 
qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)

endif



ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) libqemuutil.a libqemustub.a

ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)

ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqemustub.a

ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)



module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
@@ -666,6 +780,10 @@ ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fa 
Makefile: $(GENERATED_HEADERS)

endif



.SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=%-timestamp) \

	$(TRACE_SOURCES) $(TRACE_SOURCES:%=%-timestamp) \

	$(TRACE_DTRACE) $(TRACE_DTRACE:%=%-timestamp)



# Include automatically generated dependency files

# Dependencies in Makefile.objs files come from our recursive subdir rules

-include $(wildcard *.d tests/*.d)

Makefile.objs

+55 −44
Original line number Diff line number Diff line
@@ -119,47 +119,58 @@ ivshmem-server-obj-y = contrib/ivshmem-server/ 
libvhost-user-obj-y = contrib/libvhost-user/



######################################################################

trace-events-y = trace-events

trace-events-y += util/trace-events

trace-events-y += crypto/trace-events

trace-events-y += io/trace-events

trace-events-y += migration/trace-events

trace-events-y += block/trace-events

trace-events-y += hw/block/trace-events

trace-events-y += hw/char/trace-events

trace-events-y += hw/intc/trace-events

trace-events-y += hw/net/trace-events

trace-events-y += hw/virtio/trace-events

trace-events-y += hw/audio/trace-events

trace-events-y += hw/misc/trace-events

trace-events-y += hw/usb/trace-events

trace-events-y += hw/scsi/trace-events

trace-events-y += hw/nvram/trace-events

trace-events-y += hw/display/trace-events

trace-events-y += hw/input/trace-events

trace-events-y += hw/timer/trace-events

trace-events-y += hw/dma/trace-events

trace-events-y += hw/sparc/trace-events

trace-events-y += hw/sd/trace-events

trace-events-y += hw/isa/trace-events

trace-events-y += hw/mem/trace-events

trace-events-y += hw/i386/trace-events

trace-events-y += hw/9pfs/trace-events

trace-events-y += hw/ppc/trace-events

trace-events-y += hw/pci/trace-events

trace-events-y += hw/s390x/trace-events

trace-events-y += hw/vfio/trace-events

trace-events-y += hw/acpi/trace-events

trace-events-y += hw/arm/trace-events

trace-events-y += hw/alpha/trace-events

trace-events-y += ui/trace-events

trace-events-y += audio/trace-events

trace-events-y += net/trace-events

trace-events-y += target/arm/trace-events

trace-events-y += target/i386/trace-events

trace-events-y += target/sparc/trace-events

trace-events-y += target/s390x/trace-events

trace-events-y += target/ppc/trace-events

trace-events-y += qom/trace-events

trace-events-y += linux-user/trace-events

trace-events-y += qapi/trace-events
 
trace-events-subdirs =

trace-events-subdirs += util

trace-events-subdirs += crypto

trace-events-subdirs += io

trace-events-subdirs += migration

trace-events-subdirs += block

trace-events-subdirs += hw/block

trace-events-subdirs += hw/block/dataplane

trace-events-subdirs += hw/char

trace-events-subdirs += hw/intc

trace-events-subdirs += hw/net

trace-events-subdirs += hw/virtio

trace-events-subdirs += hw/audio

trace-events-subdirs += hw/misc

trace-events-subdirs += hw/usb

trace-events-subdirs += hw/scsi

trace-events-subdirs += hw/nvram

trace-events-subdirs += hw/display

trace-events-subdirs += hw/input

trace-events-subdirs += hw/timer

trace-events-subdirs += hw/dma

trace-events-subdirs += hw/sparc

trace-events-subdirs += hw/sd

trace-events-subdirs += hw/isa

trace-events-subdirs += hw/mem

trace-events-subdirs += hw/i386

trace-events-subdirs += hw/i386/xen

trace-events-subdirs += hw/9pfs

trace-events-subdirs += hw/ppc

trace-events-subdirs += hw/pci

trace-events-subdirs += hw/s390x

trace-events-subdirs += hw/vfio

trace-events-subdirs += hw/acpi

trace-events-subdirs += hw/arm

trace-events-subdirs += hw/alpha

trace-events-subdirs += hw/xen

trace-events-subdirs += ui

trace-events-subdirs += audio

trace-events-subdirs += net

trace-events-subdirs += target/arm

trace-events-subdirs += target/i386

trace-events-subdirs += target/sparc

trace-events-subdirs += target/s390x

trace-events-subdirs += target/ppc

trace-events-subdirs += qom

trace-events-subdirs += linux-user

trace-events-subdirs += qapi



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)

Makefile.target

+8 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ endif 


$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all

	$(call quiet-command,$(TRACETOOL) \

		--group=all \

		--format=stap \

		--backends=$(TRACE_BACKENDS) \

		--binary=$(bindir)/$(QEMU_PROG) \
@@ -59,6 +60,7 @@ $(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all 


$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all

	$(call quiet-command,$(TRACETOOL) \

		--group=all \

		--format=stap \

		--backends=$(TRACE_BACKENDS) \

		--binary=$(realpath .)/$(QEMU_PROG) \
@@ -68,6 +70,7 @@ $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all 


$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all

	$(call quiet-command,$(TRACETOOL) \

		--group=all \

		--format=simpletrace-stap \

		--backends=$(TRACE_BACKENDS) \

		--probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \
@@ -185,7 +188,8 @@ dummy := $(call unnest-vars,.., \ 
               qom-obj-y \

               io-obj-y \

               common-obj-y \

               common-obj-m)

               common-obj-m \

               trace-obj-y)

target-obj-y := $(target-obj-y-save)

all-obj-y += $(common-obj-y)

all-obj-y += $(target-obj-y)
@@ -197,8 +201,10 @@ all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y) 


$(QEMU_PROG_BUILD): config-devices.mak



COMMON_LDADDS = $(trace-obj-y) ../libqemuutil.a ../libqemustub.a



# build either PROG or PROGW

$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a

$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS)

	$(call LINK, $(filter-out %.mak, $^))

ifdef CONFIG_DARWIN

	$(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"REZ","$(TARGET_DIR)$@")

aio-posix.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "qemu/rcu_queue.h"

#include "qemu/sockets.h"

#include "qemu/cutils.h"

#include "trace.h"

#include "trace-root.h"

#ifdef CONFIG_EPOLL_CREATE1

#include <sys/epoll.h>

#endif