diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-17 16:54:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-17 16:54:09 +0000 |
| commit | ab4b92760498e097ff668f0e9c83aa87a2ec1128 (patch) | |
| tree | 5e3d149bb2208e765481df6fa9c76d2361a0670f /trace/control.c | |
| parent | 23eb9e6b6d5315171cc15969bbc755f258004df0 (diff) | |
| parent | a47e87151e785977d34e7b726495e7781860ca9f (diff) | |
| download | focaccia-qemu-ab4b92760498e097ff668f0e9c83aa87a2ec1128.tar.gz focaccia-qemu-ab4b92760498e097ff668f0e9c83aa87a2ec1128.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 16 Jan 2017 13:44:46 GMT # 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: Add event "guest_cpu_exit" trace: Fix dynamic event state on vCPU hot-unplug trace: Lock vCPU list when initializing dynamic tracing state trace-events: spelling fix Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace/control.c')
| -rw-r--r-- | trace/control.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/trace/control.c b/trace/control.c index 1a7bee6ddc..56a2632584 100644 --- a/trace/control.c +++ b/trace/control.c @@ -26,6 +26,7 @@ #include "qemu/error-report.h" #include "qemu/config-file.h" #include "monitor/monitor.h" +#include "trace.h" int trace_events_enabled_count; @@ -259,6 +260,24 @@ void trace_init_file(const char *file) #endif } +void trace_fini_vcpu(CPUState *vcpu) +{ + TraceEventIter iter; + TraceEvent *ev; + + trace_guest_cpu_exit(vcpu); + + trace_event_iter_init(&iter, NULL); + while ((ev = trace_event_iter_next(&iter)) != NULL) { + if (trace_event_is_vcpu(ev) && + trace_event_get_state_static(ev) && + trace_event_get_vcpu_state_dynamic(vcpu, ev)) { + /* must disable to affect the global counter */ + trace_event_set_vcpu_state_dynamic(vcpu, ev, false); + } + } +} + bool trace_init_backends(void) { #ifdef CONFIG_TRACE_SIMPLE |