diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-06 12:41:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-06 12:41:24 +0100 |
| commit | 30e7d092b26146eb2abb77e0a0952aea012e36bf (patch) | |
| tree | 8188256de4bf74dde49d9f048c4af3b4212b70ea /stubs/trace-control.c | |
| parent | 1fd66154fdf8305e6668a96046a22b863b4d7320 (diff) | |
| parent | 8eb1b9db559e243043aaeac3a0aa97e1f4a403c4 (diff) | |
| download | focaccia-qemu-30e7d092b26146eb2abb77e0a0952aea012e36bf.tar.gz focaccia-qemu-30e7d092b26146eb2abb77e0a0952aea012e36bf.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 05 Sep 2016 20:41:04 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: trace: Avoid implicit bool->integer conversions trace: Remove 'trace_events_dstate_init' trace: add syslog tracing backend Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'stubs/trace-control.c')
| -rw-r--r-- | stubs/trace-control.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/stubs/trace-control.c b/stubs/trace-control.c index fe59836fce..2dfcd9fb2b 100644 --- a/stubs/trace-control.c +++ b/stubs/trace-control.c @@ -11,13 +11,31 @@ #include "trace/control.h" +void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state) +{ + trace_event_set_state_dynamic(ev, state); +} + void trace_event_set_state_dynamic(TraceEvent *ev, bool state) { TraceEventID id; + bool state_pre; assert(trace_event_get_state_static(ev)); id = trace_event_get_id(ev); - trace_events_enabled_count += state - trace_events_dstate[id]; - trace_events_dstate[id] = state; + /* + * We ignore the "vcpu" property here, since there's no target code. Then + * dstate can only be 1 or 0. + */ + state_pre = trace_events_dstate[id]; + if (state_pre != state) { + if (state) { + trace_events_enabled_count++; + trace_events_dstate[id] = 1; + } else { + trace_events_enabled_count--; + trace_events_dstate[id] = 0; + } + } } void trace_event_set_vcpu_state_dynamic(CPUState *vcpu, |