Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.1-pull-request...

[qemu.git] / qemu-option-trace.texi

diff --git a/qemu-option-trace.texi b/qemu-option-trace.texi
index 693ab5a3e134ae40b70408d7f1251cdd622d4727..7d1b7f05c542748d4fc703d92a27193ac01fabf0 100644 (file)
--- a/qemu-option-trace.texi
+++ b/qemu-option-trace.texi
@@ -2,10 +2,9 @@ Specify tracing options.
 
 @table @option
 @item [enable=]@var{pattern}
-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}
+Immediately enable events matching @var{pattern}
+(either event name or a globbing pattern).  This option is only
+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 +14,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}