diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-11 17:13:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-11 17:13:49 +0100 |
| commit | 31fe1c414501047cbb91b695bdccc0068496dcf6 (patch) | |
| tree | dda96645dcc10c804af442b679e5b0808f036cb5 | |
| parent | aa916e409c04cb614ec2fee8b6b33836bf5998bb (diff) | |
| parent | cbea0ac4fe4989ae70088e01ad8b5e99f7ce3846 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Tue 11 Jul 2017 09:35:26 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
backends: remove empty trace-events file
trace: Fix early setting of events with the "vcpu" property
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | Makefile.objs | 1 | ||||
| -rw-r--r-- | backends/trace-events | 0 | ||||
| -rw-r--r-- | trace/control-target.c | 10 |
3 files changed, 7 insertions, 4 deletions
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 --- a/backends/trace-events +++ /dev/null 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 <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) { |