Commit 305e6c8a 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 13 Feb 2017 16:29:26 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:
  Makefile: Make "install" depend on "trace-events-all"
  docs: update manpage for stderr->log rename

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents df96bfab 6eab3544

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ endif 
endif





install: all $(if $(BUILD_DOCS),install-doc) \

install: all $(if $(BUILD_DOCS),install-doc) $(BUILD_DIR)/trace-events-all \

install-datadir install-localstatedir

ifneq ($(TOOLS),)

	$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))

qemu-option-trace.texi

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Specify tracing options. 
Immediately enable events matching @var{pattern}.

The file must contain one event name (as listed in the @file{trace-events-all}

file) per line; globbing patterns are accepted too.  This option is only

available if QEMU has been compiled with the @var{simple}, @var{stderr}

available if QEMU has been compiled with the @var{simple}, @var{log}

or @var{ftrace} tracing backend.  To specify multiple events or patterns,

specify the @option{-trace} option multiple times.
@@ -15,7 +15,7 @@ Use @code{-trace help} to print a list of names of trace points. 
Immediately enable events listed in @var{file}.

The file must contain one event name (as listed in the @file{trace-events-all}

file) per line; globbing patterns are accepted too.  This option is only

available if QEMU has been compiled with the @var{simple}, @var{stderr} or

available if QEMU has been compiled with the @var{simple}, @var{log} or

@var{ftrace} tracing backend.



@item file=@var{file}