[Qemu-devel] [PULL 0/6] Tracing patches

[Qemu-devel] [PULL 0/6] Tracing patches

[Stefan Hajnoczi]

Lluis: CCed you since Mohamad's LTTng 2.x patches conflict with your cleanup
series.

The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:

  Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)

are available in the git repository at:

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

for you to fetch changes up to 94783de6fe746f86a357bc4e3e6759f7f8ad3b39:

  trace-events: Fix typo in "offset" (2014-02-19 11:14:08 +0100)

----------------------------------------------------------------
Tracing pull request

----------------------------------------------------------------
Kevin Wolf (1):
      trace-events: Fix typo in "offset"

Mohamad Gebai (5):
      Fix configure script for LTTng 2.x
      Modified the tracetool framework for LTTng 2.x
      Adapt Makefiles to the new LTTng ust interface
      Update documentation for LTTng ust tracing
      Add ust generated files to .gitignore

 .gitignore                               |   2 +
 Makefile                                 |   5 ++
 configure                                |  20 ++++--
 docs/tracing.txt                         |  36 +++++++++++
 scripts/tracetool/backend/ust.py         | 101 ++++++++++++++-----------------
 scripts/tracetool/format/ust_events_c.py |  30 +++++++++
 scripts/tracetool/format/ust_events_h.py |  57 +++++++++++++++++
 trace-events                             |   8 +--
 trace/Makefile.objs                      |  25 ++++++++
 9 files changed, 219 insertions(+), 65 deletions(-)
 create mode 100644 scripts/tracetool/format/ust_events_c.py
 create mode 100644 scripts/tracetool/format/ust_events_h.py

-- 
1.8.5.3

[Qemu-devel] [PULL 1/6] Fix configure script for LTTng 2.x

[Stefan Hajnoczi]

From: Mohamad Gebai <mohamad.gebai@gmail.com>

Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 configure | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 4648117..8c0ead9 100755
--- a/configure
+++ b/configure
@@ -3379,15 +3379,25 @@ fi
 # For 'ust' backend, test if ust headers are present
 if test "$trace_backend" = "ust"; then
   cat > $TMPC << EOF
-#include <ust/tracepoint.h>
-#include <ust/marker.h>
+#include <lttng/tracepoint.h>
 int main(void) { return 0; }
 EOF
   if compile_prog "" "" ; then
-    LIBS="-lust -lurcu-bp $LIBS"
-    libs_qga="-lust -lurcu-bp $libs_qga"
+    if $pkg_config lttng-ust --exists; then
+      lttng_ust_libs=`$pkg_config --libs lttng-ust`
+    else
+      lttng_ust_libs="-llttng-ust"
+    fi
+    if $pkg_config liburcu-bp --exists; then
+      urcu_bp_libs=`$pkg_config --libs liburcu-bp`
+    else
+      urcu_bp_libs="-lurcu-bp"
+    fi
+
+    LIBS="$lttng_ust_libs $urcu_bp_libs $LIBS"
+    libs_qga="$lttng_ust_libs $urcu_bp_libs $libs_qga"
   else
-    error_exit "Trace backend 'ust' missing libust header files"
+    error_exit "Trace backend 'ust' missing lttng-ust header files"
   fi
 fi
 
-- 
1.8.5.3

[Qemu-devel] [PULL 2/6] Modified the tracetool framework for LTTng 2.x

[Stefan Hajnoczi]

From: Mohamad Gebai <mohamad.gebai@gmail.com>

* A new format is required to generate definitions for ust tracepoints.
  Files ust_events_h.py and ust_events_c.py define common macros, while
  new function ust_events_h in events.py does the actual definition of
  each tracepoint.
* ust.py generates the new interface for calling userspace tracepoints
  with LTTng 2.x, replacing trace_name(args) to tracepoint(name, args).
* As explained in ust_events_c.py, -Wredundant-decls gives a warning
  when compiling with gcc 4.7 or older. This is specific to lttng-ust so
  for now use a pragma clause to avoid getting a warning.

Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca>
Reviewed-by: Alex Bennée <alex@bennee.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/tracetool/backend/ust.py         | 101 ++++++++++++++-----------------
 scripts/tracetool/format/ust_events_c.py |  30 +++++++++
 scripts/tracetool/format/ust_events_h.py |  57 +++++++++++++++++
 3 files changed, 132 insertions(+), 56 deletions(-)
 create mode 100644 scripts/tracetool/format/ust_events_c.py
 create mode 100644 scripts/tracetool/format/ust_events_h.py

diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py
index ea36995..41c1c75 100644
--- a/scripts/tracetool/backend/ust.py
+++ b/scripts/tracetool/backend/ust.py
@@ -18,76 +18,65 @@ from tracetool import out
 
 PUBLIC = True
 
-
 def c(events):
-    out('#include <ust/marker.h>',
-        '#undef mutex_lock',
-        '#undef mutex_unlock',
-        '#undef inline',
-        '#undef wmb',
-        '#include "trace.h"')
+    pass
+
 
+def h(events):
+    out('#include <lttng/tracepoint.h>',
+        '#include "trace/generated-ust-provider.h"',
+        '')
     for e in events:
         argnames = ", ".join(e.args.names())
         if len(e.args) > 0:
-            argnames = ', ' + argnames
-
-            out('DEFINE_TRACE(ust_%(name)s);',
-                '',
-                'static void ust_%(name)s_probe(%(args)s)',
-                '{',
-                '    trace_mark(ust, %(name)s, %(fmt)s%(argnames)s);',
-                '}',
-                name = e.name,
-                args = e.args,
-                fmt = e.fmt,
-                argnames = argnames,
-                )
-
-        else:
-            out('DEFINE_TRACE(ust_%(name)s);',
-                '',
-                'static void ust_%(name)s_probe(%(args)s)',
-                '{',
-                '    trace_mark(ust, %(name)s, UST_MARKER_NOARGS);',
-                '}',
-                name = e.name,
-                args = e.args,
-                )
-
-    # register probes
-    out('',
-        'static void __attribute__((constructor)) trace_init(void)',
-        '{')
+            argnames = ", " + argnames
 
-    for e in events:
-        out('    register_trace_ust_%(name)s(ust_%(name)s_probe);',
+        out('static inline void trace_%(name)s(%(args)s)',
+            '{',
+            '    tracepoint(qemu, %(name)s%(tp_args)s);',
+            '}',
+            '',
             name = e.name,
+            args = e.args,
+            tp_args = argnames,
             )
 
-    out('}')
-
-
-def h(events):
-    out('#include <ust/tracepoint.h>',
-        '#undef mutex_lock',
-        '#undef mutex_unlock',
-        '#undef inline',
-        '#undef wmb')
+def ust_events_c(events):
+    pass
 
+def ust_events_h(events):
     for e in events:
         if len(e.args) > 0:
-            out('DECLARE_TRACE(ust_%(name)s, TP_PROTO(%(args)s), TP_ARGS(%(argnames)s));',
-                '#define trace_%(name)s trace_ust_%(name)s',
+            out('TRACEPOINT_EVENT(',
+                '   qemu,',
+                '   %(name)s,',
+                '   TP_ARGS(%(args)s),',
+                '   TP_FIELDS(',
                 name = e.name,
-                args = e.args,
-                argnames = ", ".join(e.args.names()),
+                args = ", ".join(", ".join(i) for i in e.args),
                 )
 
+            for t,n in e.args:
+                if ('int' in t) or ('long' in t) or ('unsigned' in t) or ('size_t' in t):
+                    out('       ctf_integer(' + t + ', ' + n + ', ' + n + ')')
+                elif ('double' in t) or ('float' in t):
+                    out('       ctf_float(' + t + ', ' + n + ', ' + n + ')')
+                elif ('char *' in t) or ('char*' in t):
+                    out('       ctf_string(' + n + ', ' + n + ')')
+                elif ('void *' in t) or ('void*' in t):
+                    out('       ctf_integer_hex(unsigned long, ' + n + ', ' + n + ')')
+
+            out('   )',
+                ')',
+                '')
+
         else:
-            out('_DECLARE_TRACEPOINT_NOARGS(ust_%(name)s);',
-                '#define trace_%(name)s trace_ust_%(name)s',
+            out('TRACEPOINT_EVENT(',
+                '   qemu,',
+                '   %(name)s,',
+                '   TP_ARGS(void),',
+                '   TP_FIELDS()',
+                ')',
+                '',
                 name = e.name,
-                )
-
-    out()
+                )
\ No newline at end of file
diff --git a/scripts/tracetool/format/ust_events_c.py b/scripts/tracetool/format/ust_events_c.py
new file mode 100644
index 0000000..116e713
--- /dev/null
+++ b/scripts/tracetool/format/ust_events_c.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Generate .c for LTTng ust event description.
+"""
+
+__author__     = "Mohamad Gebai <mohamad.gebai@polymtl.ca>"
+__copyright__  = "Copyright 2012, Mohamad Gebai <mohamad.gebai@polymtl.ca>"
+__license__    = "GPL version 2 or (at your option) any later version"
+
+__maintainer__ = "Stefan Hajnoczi"
+__email__      = "stefanha@redhat.com"
+
+
+from tracetool import out
+
+
+def begin(events):
+    out('/* This file is autogenerated by tracetool, do not edit. */',
+        '',
+        '#define TRACEPOINT_DEFINE',
+        '#define TRACEPOINT_CREATE_PROBES',
+        '',
+        '/* If gcc version 4.7 or older is used, LTTng ust gives a warning when compiling with',
+        '   -Wredundant-decls.',
+        ' */',
+        '#pragma GCC diagnostic ignored "-Wredundant-decls"',
+        '',
+        '#include "generated-ust-provider.h"')
diff --git a/scripts/tracetool/format/ust_events_h.py b/scripts/tracetool/format/ust_events_h.py
new file mode 100644
index 0000000..f206eca
--- /dev/null
+++ b/scripts/tracetool/format/ust_events_h.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Generate .h for LTTng ust event description.
+"""
+
+__author__     = "Mohamad Gebai <mohamad.gebai@polymtl.ca>"
+__copyright__  = "Copyright 2012, Mohamad Gebai <mohamad.gebai@polymtl.ca>"
+__license__    = "GPL version 2 or (at your option) any later version"
+
+__maintainer__ = "Stefan Hajnoczi"
+__email__      = "stefanha@redhat.com"
+
+
+from tracetool import out
+
+
+def begin(events):
+    out('/* This file is autogenerated by tracetool, do not edit. */',
+        '',
+        '#undef TRACEPOINT_PROVIDER',
+        '#define TRACEPOINT_PROVIDER qemu',
+        '',
+        '#undef TRACEPOINT_INCLUDE_FILE',
+        '#define TRACEPOINT_INCLUDE_FILE ./generated-ust-provider.h',
+        '',
+        '#if !defined (TRACE__GENERATED_UST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)',
+        '#define TRACE__GENERATED_UST_H',
+        '',
+        '#include "qemu-common.h"',
+        '#include <lttng/tracepoint.h>',
+        '',
+        '/*',
+        ' * LTTng ust 2.0 does not allow you to use TP_ARGS(void) for tracepoints',
+        ' * requiring no arguments. We define these macros introduced in more recent'
+        ' * versions of LTTng ust as a workaround',
+        ' */',
+        '#ifndef _TP_EXPROTO1',
+        '#define _TP_EXPROTO1(a)               void',
+        '#endif',
+        '#ifndef _TP_EXDATA_PROTO1',
+        '#define _TP_EXDATA_PROTO1(a)          void *__tp_data',
+        '#endif',
+        '#ifndef _TP_EXDATA_VAR1',
+        '#define _TP_EXDATA_VAR1(a)            __tp_data',
+        '#endif',
+        '#ifndef _TP_EXVAR1',
+        '#define _TP_EXVAR1(a)',
+        '#endif',
+        '')
+
+def end(events):
+    out('#endif /* TRACE__GENERATED_UST_H */',
+        '',
+        '/* This part must be outside ifdef protection */',
+        '#include <lttng/tracepoint-event.h>')
-- 
1.8.5.3

[Qemu-devel] [PULL 3/6] Adapt Makefiles to the new LTTng ust interface

[Stefan Hajnoczi]

From: Mohamad Gebai <mohamad.gebai@gmail.com>

Add generation of new files for LTTng ust.

Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 Makefile            |  5 +++++
 trace/Makefile.objs | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Makefile b/Makefile
index 807054b..a443cd4 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,11 @@ GENERATED_HEADERS += trace/generated-tracers-dtrace.h
 endif
 GENERATED_SOURCES += trace/generated-tracers.c
 
+ifeq ($(TRACE_BACKEND),ust)
+GENERATED_HEADERS += trace/generated-ust-provider.h
+GENERATED_SOURCES += trace/generated-ust.c
+endif
+
 # Don't try to regenerate Makefile or configure
 # We don't generate any of them
 Makefile: ;
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 3b88e49..d321946 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -1,6 +1,30 @@
 # -*- mode: makefile -*-
 
 ######################################################################
+# Auto-generated event descriptions for LTTng ust code
+
+ifeq ($(TRACE_BACKEND),ust)
+$(obj)/generated-ust-provider.h: $(obj)/generated-ust-provider.h-timestamp
+$(obj)/generated-ust-provider.h-timestamp: $(SRC_PATH)/trace-events
+	$(call quiet-command,$(TRACETOOL) \
+		--format=ust-events-h \
+		--backend=$(TRACE_BACKEND) \
+		< $< > $@,"  GEN   $(patsubst %-timestamp,%,$@)")
+	@cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
+
+$(obj)/generated-ust.c: $(obj)/generated-ust.c-timestamp $(BUILD_DIR)/config-host.mak
+$(obj)/generated-ust.c-timestamp: $(SRC_PATH)/trace-events
+	$(call quiet-command,$(TRACETOOL) \
+		--format=ust-events-c \
+		--backend=$(TRACE_BACKEND) \
+		< $< > $@,"  GEN   $(patsubst %-timestamp,%,$@)")
+	@cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
+
+$(obj)/generated-events.h: $(obj)/generated-ust-provider.h
+$(obj)/generated-events.c: $(obj)/generated-ust.c
+endif
+
+######################################################################
 # Auto-generated event descriptions
 
 $(obj)/generated-events.h: $(obj)/generated-events.h-timestamp
@@ -77,5 +101,6 @@ util-obj-$(CONFIG_TRACE_DEFAULT) += default.o
 util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
 util-obj-$(CONFIG_TRACE_STDERR) += stderr.o
 util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o
+util-obj-$(CONFIG_TRACE_UST) += generated-ust.o
 util-obj-y += control.o
 util-obj-y += generated-tracers.o
-- 
1.8.5.3

[Qemu-devel] [PULL 4/6] Update documentation for LTTng ust tracing

[Stefan Hajnoczi]

From: Mohamad Gebai <mohamad.gebai@gmail.com>

Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/tracing.txt | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docs/tracing.txt b/docs/tracing.txt
index bfc261b..bf2e15c 100644
--- a/docs/tracing.txt
+++ b/docs/tracing.txt
@@ -214,6 +214,42 @@ The "ust" backend uses the LTTng Userspace Tracer library.  There are no
 monitor commands built into QEMU, instead UST utilities should be used to list,
 enable/disable, and dump traces.
 
+Package lttng-tools is required for userspace tracing. You must ensure that the
+current user belongs to the "tracing" group, or manually launch the
+lttng-sessiond daemon for the current user prior to running any instance of
+QEMU.
+
+While running an instrumented QEMU, LTTng should be able to list all available
+events:
+
+    lttng list -u
+
+Create tracing session:
+
+    lttng create mysession
+
+Enable events:
+
+    lttng enable-event qemu:g_malloc -u
+
+Where the events can either be a comma-separated list of events, or "-a" to
+enable all tracepoint events. Start and stop tracing as needed:
+
+    lttng start
+    lttng stop
+
+View the trace:
+
+    lttng view
+
+Destroy tracing session:
+
+    lttng destroy
+
+Babeltrace can be used at any later time to view the trace:
+
+    babeltrace $HOME/lttng-traces/mysession-<date>-<time>
+
 === SystemTap ===
 
 The "dtrace" backend uses DTrace sdt probes but has only been tested with
-- 
1.8.5.3

[Qemu-devel] [PULL 5/6] Add ust generated files to .gitignore

[Stefan Hajnoczi]

From: Mohamad Gebai <mohamad.gebai@gmail.com>

Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca>
Reviewed-by: Alex Bennée <alex@bennee.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6e48b5e..ff0ae64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@
 /trace/generated-tracers.dtrace
 /trace/generated-events.h
 /trace/generated-events.c
+/trace/generated-ust-provider.h
+/trace/generated-ust.c
 /libcacard/trace/generated-tracers.c
 *-timestamp
 /*-softmmu
-- 
1.8.5.3

[Qemu-devel] [PULL 6/6] trace-events: Fix typo in "offset"

[Stefan Hajnoczi]

From: Kevin Wolf <kwolf@redhat.com>

s/offet/offset/

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 trace-events | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/trace-events b/trace-events
index ab11f97..3713063 100644
--- a/trace-events
+++ b/trace-events
@@ -495,10 +495,10 @@ qcow2_writev_done_part(void *co, int cur_nr_sectors) "co %p cur_nr_sectors %d"
 qcow2_writev_data(void *co, uint64_t offset) "co %p offset %" PRIx64
 
 # block/qcow2-cluster.c
-qcow2_alloc_clusters_offset(void *co, uint64_t offset, int num) "co %p offet %" PRIx64 " num %d"
-qcow2_handle_copied(void *co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes) "co %p guest_offet %" PRIx64 " host_offset %" PRIx64 " bytes %" PRIx64
-qcow2_handle_alloc(void *co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes) "co %p guest_offet %" PRIx64 " host_offset %" PRIx64 " bytes %" PRIx64
-qcow2_do_alloc_clusters_offset(void *co, uint64_t guest_offset, uint64_t host_offset, int nb_clusters) "co %p guest_offet %" PRIx64 " host_offset %" PRIx64 " nb_clusters %d"
+qcow2_alloc_clusters_offset(void *co, uint64_t offset, int num) "co %p offset %" PRIx64 " num %d"
+qcow2_handle_copied(void *co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes) "co %p guest_offset %" PRIx64 " host_offset %" PRIx64 " bytes %" PRIx64
+qcow2_handle_alloc(void *co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes) "co %p guest_offset %" PRIx64 " host_offset %" PRIx64 " bytes %" PRIx64
+qcow2_do_alloc_clusters_offset(void *co, uint64_t guest_offset, uint64_t host_offset, int nb_clusters) "co %p guest_offset %" PRIx64 " host_offset %" PRIx64 " nb_clusters %d"
 qcow2_cluster_alloc_phys(void *co) "co %p"
 qcow2_cluster_link_l2(void *co, int nb_clusters) "co %p nb_clusters %d"
 
-- 
1.8.5.3

Re: [Qemu-devel] [PULL 0/6] Tracing patches

[Lluís Vilanova]

Stefan Hajnoczi writes:

> Lluis: CCed you since Mohamad's LTTng 2.x patches conflict with your cleanup
> series.

Will rebase and adjust.


Thanks,
  Lluis


> The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:

>   Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)

> are available in the git repository at:

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

> for you to fetch changes up to 94783de6fe746f86a357bc4e3e6759f7f8ad3b39:

>   trace-events: Fix typo in "offset" (2014-02-19 11:14:08 +0100)

> ----------------------------------------------------------------
> Tracing pull request

> ----------------------------------------------------------------
> Kevin Wolf (1):
>       trace-events: Fix typo in "offset"

> Mohamad Gebai (5):
>       Fix configure script for LTTng 2.x
>       Modified the tracetool framework for LTTng 2.x
>       Adapt Makefiles to the new LTTng ust interface
>       Update documentation for LTTng ust tracing
>       Add ust generated files to .gitignore

>  .gitignore                               |   2 +
>  Makefile                                 |   5 ++
>  configure                                |  20 ++++--
>  docs/tracing.txt                         |  36 +++++++++++
>  scripts/tracetool/backend/ust.py         | 101 ++++++++++++++-----------------
>  scripts/tracetool/format/ust_events_c.py |  30 +++++++++
>  scripts/tracetool/format/ust_events_h.py |  57 +++++++++++++++++
>  trace-events                             |   8 +--
>  trace/Makefile.objs                      |  25 ++++++++
>  9 files changed, 219 insertions(+), 65 deletions(-)
>  create mode 100644 scripts/tracetool/format/ust_events_c.py
>  create mode 100644 scripts/tracetool/format/ust_events_h.py

> -- 
> 1.8.5.3


-- 
 "And it's much the same thing with knowledge, for whenever you learn
 something new, the whole world becomes that much richer."
 -- The Princess of Pure Reason, as told by Norton Juster in The Phantom
 Tollbooth

Re: [Qemu-devel] [PULL 0/6] Tracing patches

[Stefan Hajnoczi]

On Wed, Feb 19, 2014 at 05:01:47PM +0100, Lluís Vilanova wrote:
> Stefan Hajnoczi writes:
> 
> > Lluis: CCed you since Mohamad's LTTng 2.x patches conflict with your cleanup
> > series.
> 
> Will rebase and adjust.

Sorry about that.  I had most of these patches merged for a while and
forgot about them :(.

Re: [Qemu-devel] [PULL 0/6] Tracing patches

[Peter Maydell]

On 19 February 2014 15:45, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> Lluis: CCed you since Mohamad's LTTng 2.x patches conflict with your cleanup
> series.
>
> The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:
>
>   Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 94783de6fe746f86a357bc4e3e6759f7f8ad3b39:
>
>   trace-events: Fix typo in "offset" (2014-02-19 11:14:08 +0100)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/6] Tracing patches

[Stefan Hajnoczi]

The following changes since commit f6b06fcceef465de0cf2514c9f76fe0192896781:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190121-pull-request' into staging (2019-01-23 17:57:47 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 57b7bdf426445d8356171135308dfe6d7d5fb612:

  trace: rerun tracetool after ./configure changes (2019-01-30 10:57:03 +0800)

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

User-visible changes:
 * The new qemu-trace-stap script makes it convenient to collect traces without
   writing SystemTap scripts.  See "man qemu-trace-stap" for details.

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

Daniel P. Berrangé (4):
  display: ensure qxl log_buf is a nul terminated string
  trace: enforce that every trace-events file has a final newline
  trace: forbid use of %m in trace event format strings
  trace: add ability to do simple printf logging via systemtap

Stefan Hajnoczi (1):
  trace: rerun tracetool after ./configure changes

Vladimir Sementsov-Ogievskiy (1):
  trace: improve runstate tracing

 MAINTAINERS                          |   1 +
 docs/devel/tracing.txt               |   4 +
 Makefile                             |  26 ++--
 Makefile.target                      |  11 +-
 hw/display/qxl.c                     |  14 ++-
 hw/vfio/pci.c                        |   2 +-
 vl.c                                 |   7 +-
 hw/display/trace-events              |   2 +-
 hw/gpio/trace-events                 |   2 +-
 hw/vfio/trace-events                 |   2 +-
 scripts/qemu-trace-stap              | 175 +++++++++++++++++++++++++++
 scripts/qemu-trace-stap.texi         | 140 +++++++++++++++++++++
 scripts/tracetool/__init__.py        |   6 +
 scripts/tracetool/format/log_stap.py | 127 +++++++++++++++++++
 trace-events                         |   4 +-
 15 files changed, 502 insertions(+), 21 deletions(-)
 create mode 100755 scripts/qemu-trace-stap
 create mode 100644 scripts/qemu-trace-stap.texi
 create mode 100644 scripts/tracetool/format/log_stap.py

-- 
2.20.1

Re: [Qemu-devel] [PULL 0/6] Tracing patches

[Peter Maydell]

On Wed, 30 Jan 2019 at 03:18, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit f6b06fcceef465de0cf2514c9f76fe0192896781:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190121-pull-request' into staging (2019-01-23 17:57:47 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 57b7bdf426445d8356171135308dfe6d7d5fb612:
>
>   trace: rerun tracetool after ./configure changes (2019-01-30 10:57:03 +0800)
>
> ----------------------------------------------------------------
> Pull request
>
> User-visible changes:
>  * The new qemu-trace-stap script makes it convenient to collect traces without
>    writing SystemTap scripts.  See "man qemu-trace-stap" for details.
>

Applied, thanks.

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

-- PMM

[Qemu-devel] [PULL 0/6] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 00928a421d47f49691cace1207481b7aad31b1f1:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180626' into staging (2018-06-26 18:23:49 +0100)

are available in the Git repository at:

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

for you to fetch changes up to ec09f877532210e28e1d4b6b12896d3eb6d8e8d1:

  trace: forbid floating point types (2018-06-27 11:09:29 +0100)

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

 * Trace TCG atomic memory accesses
 * Document that trace event arguments cannot be floating point

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

Emilio G. Cota (5):
  trace: fix misreporting of TCG access sizes for user-space
  trace: simplify trace_mem functions
  trace: expand mem_info:size_shift to 3 bits
  trace: add trace_mem_build_info_no_se_be/le
  trace: enable tracing of TCG atomics

Stefan Hajnoczi (1):
  trace: forbid floating point types

 docs/devel/tracing.txt                    |  5 ++
 accel/tcg/atomic_template.h               | 87 +++++++++++++++++++++--
 include/exec/cpu_ldst_useronly_template.h | 11 ++-
 trace/mem-internal.h                      | 58 ++++++++-------
 trace/mem.h                               |  2 +-
 migration/trace-events                    |  2 +-
 qapi/trace-events                         |  2 +-
 scripts/tracetool/__init__.py             |  2 -
 8 files changed, 130 insertions(+), 39 deletions(-)

-- 
2.17.1

Re: [Qemu-devel] [PULL 0/6] Tracing patches

[Peter Maydell]

On 27 June 2018 at 13:58, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 00928a421d47f49691cace1207481b7aad31b1f1:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180626' into staging (2018-06-26 18:23:49 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to ec09f877532210e28e1d4b6b12896d3eb6d8e8d1:
>
>   trace: forbid floating point types (2018-06-27 11:09:29 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
>  * Trace TCG atomic memory accesses
>  * Document that trace event arguments cannot be floating point
>
Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/6] Tracing patches

[Stefan Hajnoczi]

The following changes since commit b0b36e5d2e4c8a96c2f6dbc0981a9fd0cde111d8:

  doc: fix slirp description (2011-04-25 23:10:04 +0200)

are available in the git repository at:
  git://repo.or.cz/qemu/stefanha.git tracing

Lluís (3):
      docs/tracing.txt: minor documentation fixes
      trace: [ust] fix generation of 'trace.c' on events without args
      trace: [trace-events] fix print formats in some events

Paolo Bonzini (1):
      tracetool: allow ) in trace output string

Stefan Hajnoczi (2):
      trace: Remove %s in grlib trace events
      docs: Trace events must not expect pointer dereferencing

 docs/tracing.txt   |   23 ++++++++++++++---------
 hw/grlib_apbuart.c |    2 +-
 hw/grlib_gptimer.c |   29 ++++++++++++++---------------
 hw/grlib_irqmp.c   |    4 ++--
 scripts/tracetool  |    9 +++++----
 trace-events       |   14 +++++++-------
 6 files changed, 43 insertions(+), 38 deletions(-)

Re: [Qemu-devel] [PULL 0/6] Tracing patches

[Anthony Liguori]

On 04/26/2011 07:25 AM, Stefan Hajnoczi wrote:
> The following changes since commit b0b36e5d2e4c8a96c2f6dbc0981a9fd0cde111d8:
>
>    doc: fix slirp description (2011-04-25 23:10:04 +0200)
>
> are available in the git repository at:
>    git://repo.or.cz/qemu/stefanha.git tracing

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Lluís (3):
>        docs/tracing.txt: minor documentation fixes
>        trace: [ust] fix generation of 'trace.c' on events without args
>        trace: [trace-events] fix print formats in some events
>
> Paolo Bonzini (1):
>        tracetool: allow ) in trace output string
>
> Stefan Hajnoczi (2):
>        trace: Remove %s in grlib trace events
>        docs: Trace events must not expect pointer dereferencing
>
>   docs/tracing.txt   |   23 ++++++++++++++---------
>   hw/grlib_apbuart.c |    2 +-
>   hw/grlib_gptimer.c |   29 ++++++++++++++---------------
>   hw/grlib_irqmp.c   |    4 ++--
>   scripts/tracetool  |    9 +++++----
>   trace-events       |   14 +++++++-------
>   6 files changed, 43 insertions(+), 38 deletions(-)
>