ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request 

Contains a fix to use double-dash consistently with tracing command-line
 options in documentation and output.
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJbULtTAAoJEJykq7OBq3PIJFUH/iuk6OMzhBcC//yOkCswN8te
 7LIOnfQHyN5nz9PUfYO2yOhlQNUbub6oNA4UFV6EfOJ1rmteYA8EOw2sqUp8h7Gw
 FoSeo/CA6cAKuyiEHPhn+e59h1R7zP+xc2aW8heoeR2VRQ5YRRA89MocDDLaVAVC
 9h6jmaE9wR5kv9Dsf2eZezXItISnLiJS5OpsMMCOahyVlprl9L56bfAWBhuQqbhB
 IAQpdVBB2FTBMeOKlHX8vFSMppfV3PvjF6ynPmdGZeUY6rm9dlkgd/sNr1gCaxZP
 YH2tbTwE+LHA2Fs/zYTXPWBMXuknvYHelbNpCdshbIXE20/VXP82kjnQfopBo98=
 =/8Hl
 -----END PGP SIGNATURE-----

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

Pull request

Contains a fix to use double-dash consistently with tracing command-line
options in documentation and output.

# gpg: Signature made Thu 19 Jul 2018 17:24:51 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# 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:
  tracing: Use double-dash spelling for trace option

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-07-19 18:25:53 +01:00
parent 9f2b67e1ca db817b8c50
commit 0b46a3f005
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/devel/tracing.txt
View File

@ -18,7 +18,7 @@ for debugging, profiling, and observing execution.
3. Run the virtual machine to produce a trace file: 3. Run the virtual machine to produce a trace file:
qemu -trace events=/tmp/events ... # your normal QEMU invocation qemu --trace events=/tmp/events ... # your normal QEMU invocation
4. Pretty-print the binary trace file: 4. Pretty-print the binary trace file:
@ -157,11 +157,11 @@ The state of events can also be queried and modified through monitor commands:
* trace-event NAME on|off * trace-event NAME on|off
Enable/disable a given trace event or a group of events (using wildcards). Enable/disable a given trace event or a group of events (using wildcards).
The "-trace events=<file>" command line argument can be used to enable the The "--trace events=<file>" command line argument can be used to enable the
events listed in <file> from the very beginning of the program. This file must events listed in <file> from the very beginning of the program. This file must
contain one event name per line. contain one event name per line.
If a line in the "-trace events=<file>" file begins with a '-', the trace event If a line in the "--trace events=<file>" file begins with a '-', the trace event
will be disabled instead of enabled. This is useful when a wildcard was used will be disabled instead of enabled. This is useful when a wildcard was used
to enable an entire family of events but one noisy event needs to be disabled. to enable an entire family of events but one noisy event needs to be disabled.

4
trace/control.c
View File

@ -253,7 +253,7 @@ void trace_init_file(const char *file)
#ifdef CONFIG_TRACE_SIMPLE #ifdef CONFIG_TRACE_SIMPLE
st_set_trace_file(file); st_set_trace_file(file);
#elif defined CONFIG_TRACE_LOG #elif defined CONFIG_TRACE_LOG
/* If both the simple and the log backends are enabled, "-trace file" /* If both the simple and the log backends are enabled, "--trace file"
* only applies to the simple backend; use "-D" for the log backend. * only applies to the simple backend; use "-D" for the log backend.
*/ */
if (file) { if (file) {
@ -261,7 +261,7 @@ void trace_init_file(const char *file)
} }
#else #else
if (file) { if (file) {
fprintf(stderr, "error: -trace file=...: " fprintf(stderr, "error: --trace file=...: "
"option not supported by the selected tracing backends\n"); "option not supported by the selected tracing backends\n");
exit(1); exit(1);
} }

4
trace/control.h
View File

@ -193,7 +193,7 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
/** /**
* trace_init_backends: * trace_init_backends:
* @file: Name of trace output file; may be NULL. * @file: Name of trace output file; may be NULL.
* Corresponds to commandline option "-trace file=...". * Corresponds to commandline option "--trace file=...".
* *
* Initialize the tracing backend. * Initialize the tracing backend.
* *
@ -204,7 +204,7 @@ bool trace_init_backends(void);
/** /**
* trace_init_file: * trace_init_file:
* @file: Name of trace output file; may be NULL. * @file: Name of trace output file; may be NULL.
* Corresponds to commandline option "-trace file=...". * Corresponds to commandline option "--trace file=...".
* *
* Record the name of the output file for the tracing backend. * Record the name of the output file for the tracing backend.
* Exits if no selected backend does not support specifying the * Exits if no selected backend does not support specifying the