Commit 22d96eac authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging 



Pull request

# gpg: Signature made Mon 29 Apr 2019 17:10:40 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: fix runstate tracing

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 82b2865e b1939fcd

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ void runstate_set(RunState new_state) 
    assert(new_state < RUN_STATE__MAX);



    trace_runstate_set(current_run_state, RunState_str(current_run_state),

                       new_state, RunState_str(current_run_state));

                       new_state, RunState_str(new_state));



    if (current_run_state == new_state) {

        return;