jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>

Peter Maydell 22d96eac 82b2865e

+1 -1
+1 -1
vl.c
··· 725 725 assert(new_state < RUN_STATE__MAX); 726 726 727 727 trace_runstate_set(current_run_state, RunState_str(current_run_state), 728 - new_state, RunState_str(current_run_state)); 728 + new_state, RunState_str(new_state)); 729 729 730 730 if (current_run_state == new_state) { 731 731 return;