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

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

[Stefan Hajnoczi]

The following changes since commit 6b06e3e49eb8c91cc286c16d6bf3181ac296f33d:

  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-10-v2' into staging (2017-07-10 16:12:47 +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 cbea0ac4fe4989ae70088e01ad8b5e99f7ce3846:

  backends: remove empty trace-events file (2017-07-11 09:35:11 +0100)

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

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

Daniel P. Berrange (1):
  backends: remove empty trace-events file

Lluís Vilanova (1):
  trace: Fix early setting of events with the "vcpu" property

 Makefile.objs          |  1 -
 trace/control-target.c | 10 +++++++---
 backends/trace-events  |  0
 3 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 backends/trace-events

-- 
2.9.4

[Qemu-devel] [PULL 1/2] trace: Fix early setting of events with the "vcpu" property

[Stefan Hajnoczi]

From: Lluís Vilanova <vilanova@ac.upc.edu>

Events with the "vcpu" property need to be set globally (i.e., as if they didn't
have that property) while we have not yet created any vCPU.

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Message-id: 149838891852.10366.11525912227070211356.stgit@frigg.lan
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 trace/control-target.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/trace/control-target.c b/trace/control-target.c
index 6266e63..99a8ed5 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -1,7 +1,7 @@
 /*
  * Interface for configuring and controlling the state of tracing events.
  *
- * Copyright (C) 2014-2016 Lluís Vilanova <vilanova@ac.upc.edu>
+ * Copyright (C) 2014-2017 Lluís Vilanova <vilanova@ac.upc.edu>
  *
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
@@ -38,12 +38,16 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
 {
     CPUState *vcpu;
     assert(trace_event_get_state_static(ev));
-    if (trace_event_is_vcpu(ev)) {
+    if (trace_event_is_vcpu(ev) && likely(first_cpu != NULL)) {
         CPU_FOREACH(vcpu) {
             trace_event_set_vcpu_state_dynamic(vcpu, ev, state);
         }
     } else {
-        /* Without the "vcpu" property, dstate can only be 1 or 0 */
+        /*
+         * Without the "vcpu" property, dstate can only be 1 or 0. With it, we
+         * haven't instantiated any vCPU yet, so we will set a global state
+         * instead, and trace_init_vcpu will reconcile it afterwards.
+         */
         bool state_pre = *ev->dstate;
         if (state_pre != state) {
             if (state) {
-- 
2.9.4

[Qemu-devel] [PULL 2/2] backends: remove empty trace-events file

[Stefan Hajnoczi]

From: "Daniel P. Berrange" <berrange@redhat.com>

The content of the backends/trace-events file was entirely
removed in

  commit 6b10e573d15ef82dbc5c5b3726028e6642e134f6
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   Mon May 29 12:39:42 2017 +0400

    char: move char devices to chardev/

Leaving the empty file around, causes tracetool to generate
an empty .dtrace file which makes the dtrace compiler throw
a syntax error.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170629162046.4135-1-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 Makefile.objs         | 1 -
 backends/trace-events | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 backends/trace-events

diff --git a/Makefile.objs b/Makefile.objs
index 3e24c32..bfd5a6c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -122,7 +122,6 @@ trace-events-subdirs += crypto
 trace-events-subdirs += io
 trace-events-subdirs += migration
 trace-events-subdirs += block
-trace-events-subdirs += backends
 trace-events-subdirs += chardev
 trace-events-subdirs += hw/block
 trace-events-subdirs += hw/block/dataplane
diff --git a/backends/trace-events b/backends/trace-events
deleted file mode 100644
index e69de29..0000000
-- 
2.9.4

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

[Peter Maydell]

On 11 July 2017 at 09:35, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 6b06e3e49eb8c91cc286c16d6bf3181ac296f33d:
>
>   Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-10-v2' into staging (2017-07-10 16:12:47 +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 cbea0ac4fe4989ae70088e01ad8b5e99f7ce3846:
>
>   backends: remove empty trace-events file (2017-07-11 09:35:11 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Daniel P. Berrange (1):
>   backends: remove empty trace-events file
>
> Lluís Vilanova (1):
>   trace: Fix early setting of events with the "vcpu" property
>

Applied, thanks.

-- PMM