[PULL 0/1] Tracing patches

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 9e601684dc24a521bb1d23215a63e5c6e79ea0bb:

  Update version for the v10.1.0-rc0 release (2025-07-22 15:48:48 -0400)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 012842c075520dbe1bd96a2fdcf4e218874ba443:

  log: make '-msg timestamp=on' apply to all qemu_log usage (2025-07-24 10:12:21 -0400)

----------------------------------------------------------------
Pull request

This commit is still worth having in QEMU 10.1 for the all-round improvements
made (consistent timestamping, binary size reduction, header pollution cleanup)
even if it's debatable whether this is a bug fix.

----------------------------------------------------------------

Daniel P. Berrangé (1):
  log: make '-msg timestamp=on' apply to all qemu_log usage

 util/log.c                       | 20 +++++++++++++++++++-
 scripts/tracetool/backend/log.py | 14 +-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

-- 
2.50.1

[PULL 1/1] log: make '-msg timestamp=on' apply to all qemu_log usage

[Stefan Hajnoczi]

From: Daniel P. Berrangé <berrange@redhat.com>

Currently the tracing 'log' back emits special code to add timestamps
to trace points sent via qemu_log(). This current impl is a bad design
for a number of reasons.

 * It changes the QEMU headers, such that 'error-report.h' content
   is visible to all files using tracing, but only when the 'log'
   backend is enabled. This has led to build failure bugs as devs
   rarely test without the (default) 'log' backend enabled, and
   CI can't cover every scenario for every trace backend.

 * It bloats the trace points definitions which are inlined into
   every probe location due to repeated inlining of timestamp
   formatting code, adding MBs of overhead to QEMU.

 * The tracing subsystem should not be treated any differently
   from other users of qemu_log. They all would benefit from
   having timestamps present.

 * The timestamp emitted with the tracepoints is in a needlessly
   different format to that used by error_report() in response
   to '-msg timestamp=on'.

This fixes all these issues simply by moving timestamp formatting
into qemu_log, using the same approach as for error_report.

The code before:

  static inline void _nocheck__trace_qcrypto_tls_creds_get_path(void * creds, const char * filename, const char * path)
  {
      if (trace_event_get_state(TRACE_QCRYPTO_TLS_CREDS_GET_PATH) && qemu_loglevel_mask(LOG_TRACE)) {
          if (message_with_timestamp) {
              struct timeval _now;
              gettimeofday(&_now, NULL);
              qemu_log("%d@%zu.%06zu:qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n",
                       qemu_get_thread_id(),
                       (size_t)_now.tv_sec, (size_t)_now.tv_usec
                       , creds, filename, path);
          } else {
              qemu_log("qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n", creds, filename, path);
          }
      }
  }

and after:

  static inline void _nocheck__trace_qcrypto_tls_creds_get_path(void * creds, const char * filename, const char * path)
  {
      if (trace_event_get_state(TRACE_QCRYPTO_TLS_CREDS_GET_PATH) && qemu_loglevel_mask(LOG_TRACE)) {
          qemu_log("qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n", creds, filename, path);
      }
  }

The log and error messages before:

  $ qemu-system-x86_64 -trace qcrypto* -object tls-creds-x509,id=tls0,dir=$HOME/tls -msg timestamp=on
  2986097@1753122905.917608:qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x55d925bd9490 dir=/var/home/berrange/tls
  2986097@1753122905.917621:qcrypto_tls_creds_get_path TLS creds path creds=0x55d925bd9490 filename=ca-cert.pem path=<none>
  2025-07-21T18:35:05.917626Z qemu-system-x86_64: Unable to access credentials /var/home/berrange/tls/ca-cert.pem: No such file or directory

and after:

  $ qemu-system-x86_64 -trace qcrypto* -object tls-creds-x509,id=tls0,dir=$HOME/tls -msg timestamp=on
  2025-07-21T18:43:28.089797Z qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x55bf5bf12380 dir=/var/home/berrange/tls
  2025-07-21T18:43:28.089815Z qcrypto_tls_creds_get_path TLS creds path creds=0x55bf5bf12380 filename=ca-cert.pem path=<none>
  2025-07-21T18:43:28.089819Z qemu-system-x86_64: Unable to access credentials /var/home/berrange/tls/ca-cert.pem: No such file or directory

The binary size before:

  $ ls -alh qemu-system-x86_64
  -rwxr-xr-x. 1 berrange berrange 87M Jul 21 19:39 qemu-system-x86_64
  $ strip qemu-system-x86_64
  $ ls -alh qemu-system-x86_64
  -rwxr-xr-x. 1 berrange berrange 30M Jul 21 19:39 qemu-system-x86_64

and after:

  $ ls -alh qemu-system-x86_64
  -rwxr-xr-x. 1 berrange berrange 85M Jul 21 19:41 qemu-system-x86_64
  $ strip qemu-system-x86_64
  $ ls -alh qemu-system-x86_64
  -rwxr-xr-x. 1 berrange berrange 29M Jul 21 19:41 qemu-system-x86_64

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-id: 20250721185452.3016488-1-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/log.c                       | 20 +++++++++++++++++++-
 scripts/tracetool/backend/log.py | 14 +-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/util/log.c b/util/log.c
index 58d24de48a..abdcb6b311 100644
--- a/util/log.c
+++ b/util/log.c
@@ -145,10 +145,28 @@ void qemu_log_unlock(FILE *logfile)
 
 void qemu_log(const char *fmt, ...)
 {
-    FILE *f = qemu_log_trylock();
+    FILE *f;
+    g_autofree const char *timestr = NULL;
+
+    /*
+     * Prepare the timestamp *outside* the logging
+     * lock so it better reflects when the message
+     * was emitted if we are delayed acquiring the
+     * mutex
+     */
+    if (message_with_timestamp) {
+        g_autoptr(GDateTime) dt = g_date_time_new_now_utc();
+        timestr = g_date_time_format_iso8601(dt);
+    }
+
+    f = qemu_log_trylock();
     if (f) {
         va_list ap;
 
+        if (timestr) {
+            fprintf(f, "%s ", timestr);
+        }
+
         va_start(ap, fmt);
         vfprintf(f, fmt, ap);
         va_end(ap);
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
index 5c9d09dd11..eb50ceea34 100644
--- a/scripts/tracetool/backend/log.py
+++ b/scripts/tracetool/backend/log.py
@@ -20,7 +20,6 @@
 
 def generate_h_begin(events, group):
     out('#include "qemu/log-for-trace.h"',
-        '#include "qemu/error-report.h"',
         '')
 
 
@@ -32,20 +31,9 @@ def generate_h(event, group):
     cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
 
     out('    if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {',
-        '        if (message_with_timestamp) {',
-        '            struct timeval _now;',
-        '            gettimeofday(&_now, NULL);',
         '#line %(event_lineno)d "%(event_filename)s"',
-        '            qemu_log("%%d@%%zu.%%06zu:%(name)s " %(fmt)s "\\n",',
-        '                     qemu_get_thread_id(),',
-        '                     (size_t)_now.tv_sec, (size_t)_now.tv_usec',
-        '                     %(argnames)s);',
+        '        qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);',
         '#line %(out_next_lineno)d "%(out_filename)s"',
-        '        } else {',
-        '#line %(event_lineno)d "%(event_filename)s"',
-        '            qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);',
-        '#line %(out_next_lineno)d "%(out_filename)s"',
-        '        }',
         '    }',
         cond=cond,
         event_lineno=event.lineno,
-- 
2.50.1

Re: [PULL 1/1] log: make '-msg timestamp=on' apply to all qemu_log usage

[Pierrick Bouvier]

On 7/24/25 7:46 AM, Stefan Hajnoczi wrote:
> From: Daniel P. Berrangé <berrange@redhat.com>
> 
> Currently the tracing 'log' back emits special code to add timestamps
> to trace points sent via qemu_log(). This current impl is a bad design
> for a number of reasons.
> 
>   * It changes the QEMU headers, such that 'error-report.h' content
>     is visible to all files using tracing, but only when the 'log'
>     backend is enabled. This has led to build failure bugs as devs
>     rarely test without the (default) 'log' backend enabled, and
>     CI can't cover every scenario for every trace backend.
> 
>   * It bloats the trace points definitions which are inlined into
>     every probe location due to repeated inlining of timestamp
>     formatting code, adding MBs of overhead to QEMU.
> 
>   * The tracing subsystem should not be treated any differently
>     from other users of qemu_log. They all would benefit from
>     having timestamps present.
> 
>   * The timestamp emitted with the tracepoints is in a needlessly
>     different format to that used by error_report() in response
>     to '-msg timestamp=on'.
> 
> This fixes all these issues simply by moving timestamp formatting
> into qemu_log, using the same approach as for error_report.
> 
> The code before:
> 
>    static inline void _nocheck__trace_qcrypto_tls_creds_get_path(void * creds, const char * filename, const char * path)
>    {
>        if (trace_event_get_state(TRACE_QCRYPTO_TLS_CREDS_GET_PATH) && qemu_loglevel_mask(LOG_TRACE)) {
>            if (message_with_timestamp) {
>                struct timeval _now;
>                gettimeofday(&_now, NULL);
>                qemu_log("%d@%zu.%06zu:qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n",
>                         qemu_get_thread_id(),
>                         (size_t)_now.tv_sec, (size_t)_now.tv_usec
>                         , creds, filename, path);
>            } else {
>                qemu_log("qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n", creds, filename, path);
>            }
>        }
>    }
> 
> and after:
> 
>    static inline void _nocheck__trace_qcrypto_tls_creds_get_path(void * creds, const char * filename, const char * path)
>    {
>        if (trace_event_get_state(TRACE_QCRYPTO_TLS_CREDS_GET_PATH) && qemu_loglevel_mask(LOG_TRACE)) {
>            qemu_log("qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n", creds, filename, path);
>        }
>    }
> 
> The log and error messages before:
> 
>    $ qemu-system-x86_64 -trace qcrypto* -object tls-creds-x509,id=tls0,dir=$HOME/tls -msg timestamp=on
>    2986097@1753122905.917608:qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x55d925bd9490 dir=/var/home/berrange/tls
>    2986097@1753122905.917621:qcrypto_tls_creds_get_path TLS creds path creds=0x55d925bd9490 filename=ca-cert.pem path=<none>
>    2025-07-21T18:35:05.917626Z qemu-system-x86_64: Unable to access credentials /var/home/berrange/tls/ca-cert.pem: No such file or directory
> 
> and after:
> 
>    $ qemu-system-x86_64 -trace qcrypto* -object tls-creds-x509,id=tls0,dir=$HOME/tls -msg timestamp=on
>    2025-07-21T18:43:28.089797Z qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x55bf5bf12380 dir=/var/home/berrange/tls
>    2025-07-21T18:43:28.089815Z qcrypto_tls_creds_get_path TLS creds path creds=0x55bf5bf12380 filename=ca-cert.pem path=<none>
>    2025-07-21T18:43:28.089819Z qemu-system-x86_64: Unable to access credentials /var/home/berrange/tls/ca-cert.pem: No such file or directory
> 
> The binary size before:
> 
>    $ ls -alh qemu-system-x86_64
>    -rwxr-xr-x. 1 berrange berrange 87M Jul 21 19:39 qemu-system-x86_64
>    $ strip qemu-system-x86_64
>    $ ls -alh qemu-system-x86_64
>    -rwxr-xr-x. 1 berrange berrange 30M Jul 21 19:39 qemu-system-x86_64
> 
> and after:
> 
>    $ ls -alh qemu-system-x86_64
>    -rwxr-xr-x. 1 berrange berrange 85M Jul 21 19:41 qemu-system-x86_64
>    $ strip qemu-system-x86_64
>    $ ls -alh qemu-system-x86_64
>    -rwxr-xr-x. 1 berrange berrange 29M Jul 21 19:41 qemu-system-x86_64
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> Message-id: 20250721185452.3016488-1-berrange@redhat.com
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   util/log.c                       | 20 +++++++++++++++++++-
>   scripts/tracetool/backend/log.py | 14 +-------------
>   2 files changed, 20 insertions(+), 14 deletions(-)
> 
> diff --git a/util/log.c b/util/log.c
> index 58d24de48a..abdcb6b311 100644
> --- a/util/log.c
> +++ b/util/log.c
> @@ -145,10 +145,28 @@ void qemu_log_unlock(FILE *logfile)
>   
>   void qemu_log(const char *fmt, ...)
>   {
> -    FILE *f = qemu_log_trylock();
> +    FILE *f;
> +    g_autofree const char *timestr = NULL;
> +
> +    /*
> +     * Prepare the timestamp *outside* the logging
> +     * lock so it better reflects when the message
> +     * was emitted if we are delayed acquiring the
> +     * mutex
> +     */
> +    if (message_with_timestamp) {
> +        g_autoptr(GDateTime) dt = g_date_time_new_now_utc();
> +        timestr = g_date_time_format_iso8601(dt);
> +    }
> +
> +    f = qemu_log_trylock();
>       if (f) {
>           va_list ap;
>   
> +        if (timestr) {
> +            fprintf(f, "%s ", timestr);
> +        }
> +
>           va_start(ap, fmt);
>           vfprintf(f, fmt, ap);
>           va_end(ap);
> diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
> index 5c9d09dd11..eb50ceea34 100644
> --- a/scripts/tracetool/backend/log.py
> +++ b/scripts/tracetool/backend/log.py
> @@ -20,7 +20,6 @@
>   
>   def generate_h_begin(events, group):
>       out('#include "qemu/log-for-trace.h"',
> -        '#include "qemu/error-report.h"',
>           '')
>   
>   
> @@ -32,20 +31,9 @@ def generate_h(event, group):
>       cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
>   
>       out('    if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {',
> -        '        if (message_with_timestamp) {',
> -        '            struct timeval _now;',
> -        '            gettimeofday(&_now, NULL);',
>           '#line %(event_lineno)d "%(event_filename)s"',
> -        '            qemu_log("%%d@%%zu.%%06zu:%(name)s " %(fmt)s "\\n",',
> -        '                     qemu_get_thread_id(),',
> -        '                     (size_t)_now.tv_sec, (size_t)_now.tv_usec',
> -        '                     %(argnames)s);',
> +        '        qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);',
>           '#line %(out_next_lineno)d "%(out_filename)s"',
> -        '        } else {',
> -        '#line %(event_lineno)d "%(event_filename)s"',
> -        '            qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);',
> -        '#line %(out_next_lineno)d "%(out_filename)s"',
> -        '        }',
>           '    }',
>           cond=cond,
>           event_lineno=event.lineno,

This broke compilation in debug on linux with all targets due to missing 
include. Not a big deal, but it's a bit surprising it passed our CI. Do 
we sometimes skip it for "simple" patches?

Fix: 
https://lore.kernel.org/qemu-devel/20250725165749.3893240-1-pierrick.bouvier@linaro.org/T/#u

Regards,
Pierrick

Re: [PULL 1/1] log: make '-msg timestamp=on' apply to all qemu_log usage

[Daniel P. Berrangé]

On Fri, Jul 25, 2025 at 10:04:50AM -0700, Pierrick Bouvier wrote:
> On 7/24/25 7:46 AM, Stefan Hajnoczi wrote:
> > From: Daniel P. Berrangé <berrange@redhat.com>
> > 
> > Currently the tracing 'log' back emits special code to add timestamps
> > to trace points sent via qemu_log(). This current impl is a bad design
> > for a number of reasons.
> > 
> >   * It changes the QEMU headers, such that 'error-report.h' content
> >     is visible to all files using tracing, but only when the 'log'
> >     backend is enabled. This has led to build failure bugs as devs
> >     rarely test without the (default) 'log' backend enabled, and
> >     CI can't cover every scenario for every trace backend.
> > 
> >   * It bloats the trace points definitions which are inlined into
> >     every probe location due to repeated inlining of timestamp
> >     formatting code, adding MBs of overhead to QEMU.
> > 
> >   * The tracing subsystem should not be treated any differently
> >     from other users of qemu_log. They all would benefit from
> >     having timestamps present.
> > 
> >   * The timestamp emitted with the tracepoints is in a needlessly
> >     different format to that used by error_report() in response
> >     to '-msg timestamp=on'.
> > 
> > This fixes all these issues simply by moving timestamp formatting
> > into qemu_log, using the same approach as for error_report.
> > 
> > The code before:
> > 
> >    static inline void _nocheck__trace_qcrypto_tls_creds_get_path(void * creds, const char * filename, const char * path)
> >    {
> >        if (trace_event_get_state(TRACE_QCRYPTO_TLS_CREDS_GET_PATH) && qemu_loglevel_mask(LOG_TRACE)) {
> >            if (message_with_timestamp) {
> >                struct timeval _now;
> >                gettimeofday(&_now, NULL);
> >                qemu_log("%d@%zu.%06zu:qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n",
> >                         qemu_get_thread_id(),
> >                         (size_t)_now.tv_sec, (size_t)_now.tv_usec
> >                         , creds, filename, path);
> >            } else {
> >                qemu_log("qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n", creds, filename, path);
> >            }
> >        }
> >    }
> > 
> > and after:
> > 
> >    static inline void _nocheck__trace_qcrypto_tls_creds_get_path(void * creds, const char * filename, const char * path)
> >    {
> >        if (trace_event_get_state(TRACE_QCRYPTO_TLS_CREDS_GET_PATH) && qemu_loglevel_mask(LOG_TRACE)) {
> >            qemu_log("qcrypto_tls_creds_get_path " "TLS creds path creds=%p filename=%s path=%s" "\n", creds, filename, path);
> >        }
> >    }
> > 
> > The log and error messages before:
> > 
> >    $ qemu-system-x86_64 -trace qcrypto* -object tls-creds-x509,id=tls0,dir=$HOME/tls -msg timestamp=on
> >    2986097@1753122905.917608:qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x55d925bd9490 dir=/var/home/berrange/tls
> >    2986097@1753122905.917621:qcrypto_tls_creds_get_path TLS creds path creds=0x55d925bd9490 filename=ca-cert.pem path=<none>
> >    2025-07-21T18:35:05.917626Z qemu-system-x86_64: Unable to access credentials /var/home/berrange/tls/ca-cert.pem: No such file or directory
> > 
> > and after:
> > 
> >    $ qemu-system-x86_64 -trace qcrypto* -object tls-creds-x509,id=tls0,dir=$HOME/tls -msg timestamp=on
> >    2025-07-21T18:43:28.089797Z qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x55bf5bf12380 dir=/var/home/berrange/tls
> >    2025-07-21T18:43:28.089815Z qcrypto_tls_creds_get_path TLS creds path creds=0x55bf5bf12380 filename=ca-cert.pem path=<none>
> >    2025-07-21T18:43:28.089819Z qemu-system-x86_64: Unable to access credentials /var/home/berrange/tls/ca-cert.pem: No such file or directory
> > 
> > The binary size before:
> > 
> >    $ ls -alh qemu-system-x86_64
> >    -rwxr-xr-x. 1 berrange berrange 87M Jul 21 19:39 qemu-system-x86_64
> >    $ strip qemu-system-x86_64
> >    $ ls -alh qemu-system-x86_64
> >    -rwxr-xr-x. 1 berrange berrange 30M Jul 21 19:39 qemu-system-x86_64
> > 
> > and after:
> > 
> >    $ ls -alh qemu-system-x86_64
> >    -rwxr-xr-x. 1 berrange berrange 85M Jul 21 19:41 qemu-system-x86_64
> >    $ strip qemu-system-x86_64
> >    $ ls -alh qemu-system-x86_64
> >    -rwxr-xr-x. 1 berrange berrange 29M Jul 21 19:41 qemu-system-x86_64
> > 
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > Reviewed-by: Markus Armbruster <armbru@redhat.com>
> > Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> > Message-id: 20250721185452.3016488-1-berrange@redhat.com
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > ---
> >   util/log.c                       | 20 +++++++++++++++++++-
> >   scripts/tracetool/backend/log.py | 14 +-------------
> >   2 files changed, 20 insertions(+), 14 deletions(-)
> > 
> > diff --git a/util/log.c b/util/log.c
> > index 58d24de48a..abdcb6b311 100644
> > --- a/util/log.c
> > +++ b/util/log.c
> > @@ -145,10 +145,28 @@ void qemu_log_unlock(FILE *logfile)
> >   void qemu_log(const char *fmt, ...)
> >   {
> > -    FILE *f = qemu_log_trylock();
> > +    FILE *f;
> > +    g_autofree const char *timestr = NULL;
> > +
> > +    /*
> > +     * Prepare the timestamp *outside* the logging
> > +     * lock so it better reflects when the message
> > +     * was emitted if we are delayed acquiring the
> > +     * mutex
> > +     */
> > +    if (message_with_timestamp) {
> > +        g_autoptr(GDateTime) dt = g_date_time_new_now_utc();
> > +        timestr = g_date_time_format_iso8601(dt);
> > +    }
> > +
> > +    f = qemu_log_trylock();
> >       if (f) {
> >           va_list ap;
> > +        if (timestr) {
> > +            fprintf(f, "%s ", timestr);
> > +        }
> > +
> >           va_start(ap, fmt);
> >           vfprintf(f, fmt, ap);
> >           va_end(ap);
> > diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
> > index 5c9d09dd11..eb50ceea34 100644
> > --- a/scripts/tracetool/backend/log.py
> > +++ b/scripts/tracetool/backend/log.py
> > @@ -20,7 +20,6 @@
> >   def generate_h_begin(events, group):
> >       out('#include "qemu/log-for-trace.h"',
> > -        '#include "qemu/error-report.h"',
> >           '')
> > @@ -32,20 +31,9 @@ def generate_h(event, group):
> >       cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
> >       out('    if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {',
> > -        '        if (message_with_timestamp) {',
> > -        '            struct timeval _now;',
> > -        '            gettimeofday(&_now, NULL);',
> >           '#line %(event_lineno)d "%(event_filename)s"',
> > -        '            qemu_log("%%d@%%zu.%%06zu:%(name)s " %(fmt)s "\\n",',
> > -        '                     qemu_get_thread_id(),',
> > -        '                     (size_t)_now.tv_sec, (size_t)_now.tv_usec',
> > -        '                     %(argnames)s);',
> > +        '        qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);',
> >           '#line %(out_next_lineno)d "%(out_filename)s"',
> > -        '        } else {',
> > -        '#line %(event_lineno)d "%(event_filename)s"',
> > -        '            qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);',
> > -        '#line %(out_next_lineno)d "%(out_filename)s"',
> > -        '        }',
> >           '    }',
> >           cond=cond,
> >           event_lineno=event.lineno,
> 
> This broke compilation in debug on linux with all targets due to missing
> include. Not a big deal, but it's a bit surprising it passed our CI. Do we
> sometimes skip it for "simple" patches?

Actually this patch did not break this. Xen was already broken for any
scenario which turned off the 'log' trace backend, which is what prompted
creation of this patch. See the thread here:

  https://lists.nongnu.org/archive/html/qemu-devel/2025-07/msg04831.html

WRT CI, the Xen issue only exists if building against fairly new Xen
versions, and have turned off the log trace backend. Given limited
resources we can't test every possible build scenario in our CI, and
this is unfortunately an example of this limitation.

This patch will avoid such bugs recurring in future by ensuring that
configure arg choices won't affect whether error-report.h is included
by default or not.

> Fix: https://lore.kernel.org/qemu-devel/20250725165749.3893240-1-pierrick.bouvier@linaro.org/T/#u


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PULL 0/1] Tracing patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.1 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit ebcc602aae19c06a4f492da3920b64c8033f0d7f:

  Merge tag 'display-20250718-pull-request' of https://gitlab.com/kraxel/qemu into staging (2025-07-21 12:24:36 -0400)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 2b1791323e7ce043cbc3857699e5d5b0ad021cbc:

  tracetool: removed the unused vcpu property (2025-07-22 10:44:49 -0400)

----------------------------------------------------------------
Pull request

Tanish's removal of the remnants of the "vcpu" property.

----------------------------------------------------------------

Tanish Desai (1):
  tracetool: removed the unused vcpu property

 scripts/tracetool/__init__.py       | 2 +-
 scripts/tracetool/backend/log.py    | 6 +-----
 scripts/tracetool/backend/simple.py | 6 +-----
 scripts/tracetool/backend/syslog.py | 6 +-----
 4 files changed, 4 insertions(+), 16 deletions(-)

-- 
2.50.1

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 56a3033abcfcf72a2f4f1376a605a0b1ad526b67:

  Merge tag 'pull-request-2025-07-21' of https://gitlab.com/thuth/qemu into staging (2025-07-21 06:34:56 -0400)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 50700e97d85e435363ca4525754b5f00b13491c0:

  trace: log.py: human-readable timestamp (2025-07-21 14:02:52 -0400)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Vladimir Sementsov-Ogievskiy (1):
  trace: log.py: human-readable timestamp

 scripts/tracetool/backend/log.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

-- 
2.50.1

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:

  Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 9b8a5fd79df09efa7bfd728ba9e0c95297e42afa:

  meson: fix Windows build (2025-06-11 14:18:01 -0400)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

oltolm (1):
  meson: fix Windows build

 contrib/plugins/meson.build         |  2 +-
 plugins/meson.build                 |  2 +-
 scripts/tracetool/__init__.py       | 15 ++++++++++++---
 scripts/tracetool/backend/ftrace.py |  4 +---
 scripts/tracetool/backend/log.py    |  4 +---
 scripts/tracetool/backend/syslog.py |  4 +---
 tests/functional/meson.build        |  4 +---
 tests/include/meson.build           |  2 +-
 tests/tcg/plugins/meson.build       |  2 +-
 trace/meson.build                   |  5 +++--
 10 files changed, 23 insertions(+), 21 deletions(-)

-- 
2.49.0

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 6322b753f798337835e205b6d805356bea582c86:

  Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2025-06-02 14:52:45 -0400)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to ffcfb0faaa95fc6ca007f7dd989e390dacf936ca:

  trace/simple: seperate hot paths of tracing fucntions (2025-06-02 16:51:36 -0400)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Tanish Desai (1):
  trace/simple: seperate hot paths of tracing fucntions

 scripts/tracetool/backend/simple.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

-- 
2.49.0

Re: [PULL 0/1] Tracing patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.1 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 5136598e2667f35ef3dc1d757616a266bd5eb3a2:

  Merge tag 'accel-cpus-20250309' of https://github.com/philmd/qemu into staging (2025-03-10 13:40:48 +0800)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to a506a1b16702aae69a43e782f225bdc0ec6545fc:

  trace/control-target: cleanup headers and make compilation unit common (2025-03-11 10:11:29 +0800)

----------------------------------------------------------------
Pull request

A tracing cleanup.

----------------------------------------------------------------

Pierrick Bouvier (1):
  trace/control-target: cleanup headers and make compilation unit common

 trace/control-target.c | 2 --
 trace/meson.build      | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

-- 
2.48.1

Re: [PULL 0/1] Tracing patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit f9edf32ea2e18a56de5d92f57e9d10565c822367:

  Merge tag 'pull-request-2025-02-11' of https://gitlab.com/thuth/qemu into staging (2025-02-11 13:27:32 -0500)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 9976be3911a2d0503f026ae37c17077273bf30ee:

  scripts: improve error from qemu-trace-stap on missing 'stap' (2025-02-12 10:03:18 -0500)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Daniel P. Berrangé (1):
  scripts: improve error from qemu-trace-stap on missing 'stap'

 scripts/qemu-trace-stap | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
2.48.1

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 455f4440687fcee03e62d9b17b28162b638458af:

  Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-12-26 06:07:16 -0500)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 5db052306e69faf9f875ad6dec7c823c140990e0:

  tracing: install trace events file only if necessary (2023-12-27 05:01:55 -0500)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Carlos Santos (1):
  tracing: install trace events file only if necessary

 trace/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.43.0

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit a3c3aaa846ad61b801e7196482dcf4afb8ba34e4:

  Merge tag 'pull-ppc-20231107' of https://gitlab.com/danielhb/qemu into staging (2023-11-08 20:35:00 +0800)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 4d96307c5b4fac40c6ca25f38318b4b65d315de0:

  tracetool: avoid invalid escape in Python string (2023-11-09 15:03:02 +0800)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Marc-André Lureau (1):
  tracetool: avoid invalid escape in Python string

 scripts/tracetool/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.41.0

Re: [PULL 0/1] Tracing patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 7623b5ba017f61de5d7c2bba12c6feb3d55091b1:

  Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request' into staging (2020-07-06 11:40:10 +0100)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 27e08bab94f7c6ebe0b75938c98c394c969e3fd8:

  tracetool: work around ust <sys/sdt.h> include conflict (2020-07-07 16:07:14 +0100)

----------------------------------------------------------------
Pull request

Fix for a LTTng Userspace Tracer header problem.

----------------------------------------------------------------

Stefan Hajnoczi (1):
  tracetool: work around ust <sys/sdt.h> include conflict

 scripts/tracetool/backend/dtrace.py | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
2.26.2

Re: [PULL 0/1] Tracing patches

[Peter Maydell]

On Tue, 7 Jul 2020 at 16:20, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 7623b5ba017f61de5d7c2bba12c6feb3d55091b1:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request' into staging (2020-07-06 11:40:10 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 27e08bab94f7c6ebe0b75938c98c394c969e3fd8:
>
>   tracetool: work around ust <sys/sdt.h> include conflict (2020-07-07 16:07:14 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
> Fix for a LTTng Userspace Tracer header problem.
>
> ----------------------------------------------------------------
>
> Stefan Hajnoczi (1):
>   tracetool: work around ust <sys/sdt.h> include conflict
>
>  scripts/tracetool/backend/dtrace.py | 6 ++++++
>  1 file changed, 6 insertions(+)


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM

[PULL 0/1] Tracing patches

[Stefan Hajnoczi]

The following changes since commit dc65a5bdc9fa543690a775b50d4ffbeb22c56d6d:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.0-20200108' into staging (2020-01-10 16:15:04 +0000)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 3f0097169bb60268cc5dda0c5ea47c31ab57b22f:

  trace: update qemu-trace-stap to Python 3 (2020-01-13 16:42:20 +0000)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Stefan Hajnoczi (1):
  trace: update qemu-trace-stap to Python 3

 scripts/qemu-trace-stap | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.24.1

Re: [PULL 0/1] Tracing patches

[Peter Maydell]

On Tue, 14 Jan 2020 at 09:29, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit dc65a5bdc9fa543690a775b50d4ffbeb22c56d6d:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.0-20200108' into staging (2020-01-10 16:15:04 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 3f0097169bb60268cc5dda0c5ea47c31ab57b22f:
>
>   trace: update qemu-trace-stap to Python 3 (2020-01-13 16:42:20 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM