aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-04-29 19:11:15 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-04-29 19:11:15 +0100
commit22d96eac64877c4d96f9928babb6f2fcc68faacf (patch)
treee221e4f99126df5089be8ee37fd4148b05b6ea44
parent82b2865e0d0ea4c1001e9e7ed7920bcc0458f6de (diff)
parentb1939fcd438b7140cb8f2685dee026bb112819d7 (diff)
downloadqemu-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 4019a43..d9fea0a 100644
--- a/vl.c
+++ b/vl.c
@@ -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;