Pull request

-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJcxyIAAAoJEJykq7OBq3PInO8IALOoQ5ZN441jKwhpa1Y5EA88
 zSWrwqZloRuuKRcVB6Ld9tCW3WEbRyChT4mb8KPVbBCawRexlI8Rx+ppDyXzBICr
 RKLdYqr9gv18ik0ZHIBgJNXnsq8OG3m9YmNyI/47RG64j6syHnhOwzLyj6sOXGmq
 ibHlqkXtGRs2jVffhg4OsD8ut4x11kjSYMC0IbnqiP3G67s9AN2STEYpx+qjFIOS
 sYW0y1ZbZkgPTatrb5MojwG/MMlX0slHC8jQ7Rc6Nkwo8e7mmSaJ/WF19WB6EyWN
 Iw4CmnED9il3HN1VGojIrNvWGviPUowOTOb5zfzhRpEX4cEwym+EorgQL2MtLV0=
 =hr1y
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2019-04-29 19:11:15 +01:00
commit 22d96eac64

2
vl.c
View File

@ -725,7 +725,7 @@ void runstate_set(RunState new_state)
assert(new_state < RUN_STATE__MAX); assert(new_state < RUN_STATE__MAX);
trace_runstate_set(current_run_state, RunState_str(current_run_state), 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) { if (current_run_state == new_state) {
return; return;