OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQEcBAABAgAGBQJYod7mAAoJEJykq7OBq3PINr4H/2p8p/ToAzbnkUD5VE1S5Jj5
 YKdLGdque8kTUadgegnuFLsiCtPZnC6faLHfzEjvSfDgjT3n4JwQnfrcpmW9sQV8
 IKrnhwGblEPd2z7B2MjhjQQuXa8SesK/zxxLpmxYKdm0RkiYh52Zs2whrOlIzkl8
 ESrl61U3J+7n8tzZ0d/wxTFfoP2vvf5V5fys3rVn1ZnpuMTGETy4cm233RwE1hZt
 DuY9HbyZyqwBX+RGfk16TpQVc6tK28a7UwOsIMCoFNN2GCt4CfFqOHJTr0D+W2YO
 JFQOTSWWZOgyfjkTr/yCb9uoPaaW9VwDMm/heAyuNYxZjV2TtjrksW30JkHp36I=
 =mdO3
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-02-13 16:44:04 +00:00
commit 305e6c8a2f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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))

4
qemu-option-trace.texi
View File

@ -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}