Commit d8782a11 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 11dd4b89 f99b38fc

trace/control-target.c

+11 −7
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu, 
            clear_bit(vcpu_id, vcpu->trace_dstate_delayed);

            (*ev->dstate)--;

        }

        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
@@ -95,6 +96,9 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu, 
             */

            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);

        }

    }

}