diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-31 17:36:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-31 17:37:00 +0000 |
| commit | 28db64fce555a03b4ca256d5b6f4290abdfbd9e8 (patch) | |
| tree | dbf7d5a1e9f85de503956a2ac81327448cc37b82 /hw | |
| parent | aeab8e5eb220cc5ff84b0b68b9afccc611bf0fcd (diff) | |
| parent | e144a605a614d22165000c69e8e1dc6986d45cd8 (diff) | |
| download | qemu-28db64fce555a03b4ca256d5b6f4290abdfbd9e8.zip qemu-28db64fce555a03b4ca256d5b6f4290abdfbd9e8.tar.gz qemu-28db64fce555a03b4ca256d5b6f4290abdfbd9e8.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Pull request
# gpg: Signature made Thu 30 Jan 2020 21:38:06 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/tags/tracing-pull-request:
qemu_set_log_filename: filename argument may be NULL
hw/display/qxl.c: Use trace_event_get_state_backends()
memory.c: Use trace_event_get_state_backends()
docs/devel/tracing.txt: Recommend only trace_event_get_state_backends()
Makefile: Keep trace-events-subdirs ordered
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/qxl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 944c02c..c33b191 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1764,7 +1764,7 @@ async_common: qxl_set_mode(d, val, 0); break; case QXL_IO_LOG: - if (TRACE_QXL_IO_LOG_ENABLED || d->guestdebug) { + if (trace_event_get_state_backends(TRACE_QXL_IO_LOG) || d->guestdebug) { /* We cannot trust the guest to NUL terminate d->ram->log_buf */ char *log_buf = g_strndup((const char *)d->ram->log_buf, sizeof(d->ram->log_buf)); |