Commit b0ad00b8 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 Mon 20 Jun 2016 21:29:27 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: (42 commits)
  trace: split out trace events for linux-user/ directory
  trace: split out trace events for qom/ directory
  trace: split out trace events for target-ppc/ directory
  trace: split out trace events for target-s390x/ directory
  trace: split out trace events for target-sparc/ directory
  trace: split out trace events for net/ directory
  trace: split out trace events for audio/ directory
  trace: split out trace events for ui/ directory
  trace: split out trace events for hw/alpha/ directory
  trace: split out trace events for hw/arm/ directory
  trace: split out trace events for hw/acpi/ directory
  trace: split out trace events for hw/vfio/ directory
  trace: split out trace events for hw/s390x/ directory
  trace: split out trace events for hw/pci/ directory
  trace: split out trace events for hw/ppc/ directory
  trace: split out trace events for hw/9pfs/ directory
  trace: split out trace events for hw/i386/ directory
  trace: split out trace events for hw/isa/ directory
  trace: split out trace events for hw/sd/ directory
  trace: split out trace events for hw/sparc/ directory
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7e13ea57 f52347d5

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
/config-target.*

/config.status

/config-temp

/trace-events-all

/trace/generated-tracers.h

/trace/generated-tracers.c

/trace/generated-tracers-dtrace.h

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ endif 
	set -e; for x in $(KEYMAPS); do \

		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \

	done

	$(INSTALL_DATA) $(SRC_PATH)/trace-events "$(DESTDIR)$(qemu_datadir)/trace-events"

	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"

	for d in $(TARGET_DIRS); do \

	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \

        done

Makefile.objs

+43 −0
Original line number Diff line number Diff line
@@ -115,3 +115,46 @@ qga-vss-dll-obj-y = qga/ 
# contrib

ivshmem-client-obj-y = contrib/ivshmem-client/

ivshmem-server-obj-y = contrib/ivshmem-server/





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

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/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-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

Makefile.target

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ else 
TARGET_TYPE=system

endif



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

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

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

		--format=stap \

		--backends=$(TRACE_BACKENDS) \
@@ -57,7 +57,7 @@ $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events 
		--target-type=$(TARGET_TYPE) \

		< $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp-installed")



$(QEMU_PROG).stp: $(SRC_PATH)/trace-events

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

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

		--format=stap \

		--backends=$(TRACE_BACKENDS) \
@@ -66,7 +66,7 @@ $(QEMU_PROG).stp: $(SRC_PATH)/trace-events 
		--target-type=$(TARGET_TYPE) \

		< $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp")



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

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

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

		--format=simpletrace-stap \

		--backends=$(TRACE_BACKENDS) \

audio/trace-events

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# See docs/trace-events.txt for syntax documentation.



# audio/alsaaudio.c

alsa_revents(int revents) "revents = %d"

alsa_pollout(int i, int fd) "i = %d fd = %d"

alsa_set_handler(int events, int index, int fd, int err) "events=%#x index=%d fd=%d err=%d"

alsa_wrote_zero(int len) "Failed to write %d frames (wrote zero)"

alsa_read_zero(long len) "Failed to read %ld frames (read zero)"

alsa_xrun_out(void) "Recovering from playback xrun"

alsa_xrun_in(void) "Recovering from capture xrun"

alsa_resume_out(void) "Resuming suspended output stream"

alsa_resume_in(void) "Resuming suspended input stream"

alsa_no_frames(int state) "No frames available and ALSA state is %d"



# audio/ossaudio.c

oss_version(int version) "OSS version = %#x"

oss_invalid_available_size(int size, int bufsize) "Invalid available size, size=%d bufsize=%d"