diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-04-29 19:11:15 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-04-29 19:11:15 +0100 |
commit | 22d96eac64877c4d96f9928babb6f2fcc68faacf (patch) | |
tree | e221e4f99126df5089be8ee37fd4148b05b6ea44 | |
parent | 82b2865e0d0ea4c1001e9e7ed7920bcc0458f6de (diff) | |
parent | b1939fcd438b7140cb8f2685dee026bb112819d7 (diff) | |
download | qemu-22d96eac64877c4d96f9928babb6f2fcc68faacf.zip qemu-22d96eac64877c4d96f9928babb6f2fcc68faacf.tar.gz qemu-22d96eac64877c4d96f9928babb6f2fcc68faacf.tar.bz2 |
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: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |