Commit 460da100 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Pull request

User-visible changes:
 * The new qemu-trace-stap script makes it convenient to collect traces without
   writing SystemTap scripts.  See "man qemu-trace-stap" for details.

# gpg: Signature made Wed 30 Jan 2019 03:17:57 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: rerun tracetool after ./configure changes
  trace: improve runstate tracing
  trace: add ability to do simple printf logging via systemtap
  trace: forbid use of %m in trace event format strings
  trace: enforce that every trace-events file has a final newline
  display: ensure qxl log_buf is a nul terminated string

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 006dce5f 57b7bdf4

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2011,6 +2011,7 @@ F: trace-events 
F: qemu-option-trace.texi

F: scripts/tracetool.py

F: scripts/tracetool/

F: scripts/qemu-trace-stap*

F: docs/devel/tracing.txt

T: git https://github.com/stefanha/qemu.git tracing

Makefile

+18 −8
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 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)

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

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

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

		--format=h \
@@ -154,7 +154,7 @@ tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") 


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

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

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

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

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

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

		--format=c \
@@ -163,7 +163,7 @@ tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") 


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

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

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

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

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

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

		--format=ust-events-h \
@@ -187,7 +187,7 @@ tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") 


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

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

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

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

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

		--group=root \

		--format=h \
@@ -196,7 +196,7 @@ trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) 


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

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

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

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

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

		--group=root \

		--format=c \
@@ -205,7 +205,7 @@ trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) 


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)

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

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

		--group=root \

		--format=ust-events-h \
@@ -214,7 +214,7 @@ trace-ust-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) 


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)

trace-ust-all.h-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_DIR)/config-host.mak

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

		--group=all \

		--format=ust-events-h \
@@ -223,7 +223,7 @@ trace-ust-all.h-timestamp: $(trace-events-files) $(tracetool-y) 


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)

trace-ust-all.c-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_DIR)/config-host.mak

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

		--group=all \

		--format=ust-events-c \
@@ -305,6 +305,9 @@ DOCS+=docs/qemu-cpu-models.7 
ifdef CONFIG_VIRTFS

DOCS+=fsdev/virtfs-proxy-helper.1

endif

ifdef CONFIG_TRACE_SYSTEMTAP

DOCS+=scripts/qemu-trace-stap.1

endif

else

DOCS=

endif
@@ -699,6 +702,9 @@ ifneq ($(TOOLS),) 
	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"

	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"

endif

ifdef CONFIG_TRACE_SYSTEMTAP

	$(INSTALL_DATA) scripts/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1"

endif

ifneq (,$(findstring qemu-ga,$(TOOLS)))

	$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8"

	$(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"
@@ -738,6 +744,9 @@ endif 
ifneq ($(HELPERS-y),)

	$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))

endif

ifdef CONFIG_TRACE_SYSTEMTAP

	$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)

endif

ifneq ($(BLOBS),)

	set -e; for x in $(BLOBS); do \

		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \
@@ -852,6 +861,7 @@ qemu-nbd.8: qemu-nbd.texi qemu-option-trace.texi 
qemu-ga.8: qemu-ga.texi

docs/qemu-block-drivers.7: docs/qemu-block-drivers.texi

docs/qemu-cpu-models.7: docs/qemu-cpu-models.texi

scripts/qemu-trace-stap.1: scripts/qemu-trace-stap.texi



html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html

info: qemu-doc.info docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info

Makefile.target

+10 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ config-target.h: config-target.h-timestamp 
config-target.h-timestamp: config-target.mak



ifdef CONFIG_TRACE_SYSTEMTAP

stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp

stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp $(QEMU_PROG)-log.stp



ifdef CONFIG_USER_ONLY

TARGET_TYPE=user
@@ -84,6 +84,14 @@ $(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all $(tracetool-y) 
		--probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \

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



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

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

		--group=all \

		--format=log-stap \

		--backends=$(TRACE_BACKENDS) \

		--probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \

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



else

stap:

endif
@@ -227,6 +235,7 @@ ifdef CONFIG_TRACE_SYSTEMTAP 
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"

	$(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"

	$(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-simpletrace.stp"

	$(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-log.stp"

endif



GENERATED_FILES += config-target.h

docs/devel/tracing.txt

+4 −0
Original line number Diff line number Diff line
@@ -317,6 +317,10 @@ probes: 
                         --target-name x86_64 \

                         <trace-events-all >qemu.stp



To facilitate simple usage of systemtap where there merely needs to be printf

logging of certain probes, a helper script "qemu-trace-stap" is provided.

Consult its manual page for guidance on its usage.



== Trace event properties ==



Each event in the "trace-events-all" file can be prefixed with a space-separated

hw/display/qxl.c

+10 −4
Original line number Diff line number Diff line
@@ -1763,10 +1763,16 @@ async_common: 
        qxl_set_mode(d, val, 0);

        break;

    case QXL_IO_LOG:

        trace_qxl_io_log(d->id, d->ram->log_buf);

        if (TRACE_QXL_IO_LOG_ENABLED || d->guestdebug) {

            /* We cannot trust the guest to NUL terminate d->ram->log_buf */

            char *log_buf = g_strndup((const char *)d->ram->log_buf,

                                      sizeof(d->ram->log_buf));

            trace_qxl_io_log(d->id, log_buf);

            if (d->guestdebug) {

                fprintf(stderr, "qxl/guest-%d: %" PRId64 ": %s", d->id,

                    qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), d->ram->log_buf);

                        qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), log_buf);

            }

            g_free(log_buf);

        }

        break;

    case QXL_IO_RESET: