diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-01 16:28:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-01 16:28:00 +0000 |
| commit | cf7ca7d5b9faca13f1f8e3ea92cfb2f741eb0c0e (patch) | |
| tree | 8ad159f55a3d842a3051a9a55ab01e90e3741af5 /util/qemu-error.c | |
| parent | 74208cd252c5da9d867270a178799abd802b9338 (diff) | |
| parent | 0dfb3ca73c54fc105ab78e37e31ab05bed1360aa (diff) | |
| download | focaccia-qemu-cf7ca7d5b9faca13f1f8e3ea92cfb2f741eb0c0e.tar.gz focaccia-qemu-cf7ca7d5b9faca13f1f8e3ea92cfb2f741eb0c0e.zip | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging
Pull request # gpg: Signature made Mon 01 Feb 2021 15:46:52 GMT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha-gitlab/tags/tracing-pull-request: trace: update docs with meson build information trace: document how to specify multiple --trace patterns simpletrace: build() missing 2 required positional arguments trace: make the 'log' backend timestamp configurable error: rename error_with_timestamp to message_with_timestamp trace: add meson custom_target() depend_files for tracetool tracetool: also strip %l and %ll from systemtap format strings tracetool: fix "PRI" macro decoding trace: recommend "log" backend for getting started with tracing tracing: convert documentation to rST trace: fix simpletrace doc mismerge Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-error.c')
| -rw-r--r-- | util/qemu-error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/qemu-error.c b/util/qemu-error.c index aa30f03564..52a9e013c4 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -25,7 +25,7 @@ typedef enum { } report_type; /* Prepend timestamp to messages */ -bool error_with_timestamp; +bool message_with_timestamp; bool error_with_guestname; const char *error_guest_name; @@ -208,7 +208,7 @@ static void vreport(report_type type, const char *fmt, va_list ap) GTimeVal tv; gchar *timestr; - if (error_with_timestamp && !monitor_cur()) { + if (message_with_timestamp && !monitor_cur()) { g_get_current_time(&tv); timestr = g_time_val_to_iso8601(&tv); error_printf("%s ", timestr); |