From f5956d71fbcde392e9a643d0e8a57f9f01fabc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Date: Sun, 25 Jun 2017 14:08:38 +0300 Subject: [PATCH 1/2] trace: Fix early setting of events with the "vcpu" property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Message-id: 149838891852.10366.11525912227070211356.stgit@frigg.lan Signed-off-by: Stefan Hajnoczi --- 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 6266e6380d..99a8ed5157 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 + * Copyright (C) 2014-2017 Lluís Vilanova * * 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) { From cbea0ac4fe4989ae70088e01ad8b5e99f7ce3846 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 29 Jun 2017 17:20:46 +0100 Subject: [PATCH 2/2] backends: remove empty trace-events file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The content of the backends/trace-events file was entirely removed in commit 6b10e573d15ef82dbc5c5b3726028e6642e134f6 Author: Marc-André Lureau 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 Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Message-id: 20170629162046.4135-1-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- 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 3e24c320c3..bfd5a6ceb1 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 e69de29bb2..0000000000