diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-28 12:57:32 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-28 12:57:32 -0500 |
commit | 837df37e881e14ffdb05c2b912b2ad30b851c9d3 (patch) | |
tree | 236f8c569e5b04139b2a009061c0e4208b248954 /vl.c | |
parent | e280ff5e9159ed227a117339c1157143627cab96 (diff) | |
parent | 7e8660032cd21c1bdc4160b8fab7deec62e1aa12 (diff) | |
download | qemu-837df37e881e14ffdb05c2b912b2ad30b851c9d3.tar.gz qemu-837df37e881e14ffdb05c2b912b2ad30b851c9d3.tar.bz2 qemu-837df37e881e14ffdb05c2b912b2ad30b851c9d3.zip |
Merge remote-tracking branch 'stefanha/tracing' into staging
# By LluĂs Vilanova (7) and others
# Via Stefan Hajnoczi
* stefanha/tracing:
vl: add runstate_set tracepoint
.gitignore: rename trace/generated-tracers.dtrace
.gitignore: add trace/generated-events.[ch]
trace: rebuild generated-events.o when configuration changes
trace: [stderr] Port to generic event information and new control interface
trace: [simple] Port to generic event information and new control interface
trace: [default] Port to generic event information and new control interface
trace: [monitor] Use new event control interface
trace: Provide a detailed event control interface
trace: Provide a generic tracing event descriptor
trace: [tracetool] Explicitly identify public backends
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -642,7 +642,7 @@ void runstate_set(RunState new_state) RunState_lookup[new_state]); abort(); } - + trace_runstate_set(new_state); current_run_state = new_state; } |