aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-09-16 12:36:53 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-09-16 12:36:53 +0100
commitd8782a113a5f21a030b35fc35f0871b937685227 (patch)
treea07c67bbcd7d315d102696016577d0539950af6f
parent11dd4b89d0452d6587aa310c7020685642b708f7 (diff)
parentf99b38fc7c1bdf2dcc5e316478281c35b8c60f79 (diff)
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 15 Sep 2017 18:39:41 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: Immediately apply per-vCPU state changes if a vCPU is being created Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--trace/control-target.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/trace/control-target.c b/trace/control-target.c
index 4e36101997..706b2cee9d 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -88,13 +88,17 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
clear_bit(vcpu_id, vcpu->trace_dstate_delayed);
(*ev->dstate)--;
}
- /*
- * Delay changes until next TB; we want all TBs to be built from a
- * single set of dstate values to ensure consistency of generated
- * tracing code.
- */
- async_run_on_cpu(vcpu, trace_event_synchronize_vcpu_state_dynamic,
- RUN_ON_CPU_NULL);
+ if (vcpu->created) {
+ /*
+ * Delay changes until next TB; we want all TBs to be built from a
+ * single set of dstate values to ensure consistency of generated
+ * tracing code.
+ */
+ async_run_on_cpu(vcpu, trace_event_synchronize_vcpu_state_dynamic,
+ RUN_ON_CPU_NULL);
+ } else {
+ trace_event_synchronize_vcpu_state_dynamic(vcpu, RUN_ON_CPU_NULL);
+ }
}
}