diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-13 16:44:04 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-13 16:44:04 +0000 |
| commit | 305e6c8a2ff7a6e3f4942b50e853230f18eeb5a9 (patch) | |
| tree | 6a1690cf5297af2eebbbe030cf95f0905507f984 | |
| parent | df96bfab49dab2d0373e49b51bbb51ce72e1601e (diff) | |
| parent | 6eab3544f47207e976df37a85c5855bf55754713 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | qemu-option-trace.texi | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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)) diff --git a/qemu-option-trace.texi b/qemu-option-trace.texi index 693ab5a3e1..4166d5cdc2 100644 --- a/qemu-option-trace.texi +++ b/qemu-option-trace.texi @@ -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} |