diff options
| author | Peter Maydell | 2016-02-03 20:00:33 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-03 20:00:33 +0100 |
| commit | 382d34ff9fcc534db32d54eb82590de7c04f9b33 (patch) | |
| tree | b8b23b009ff6dba3650a5d16143a919c90436df5 /linux-user/main.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160203-1' into s... (diff) | |
| parent | log: add "-d trace:PATTERN" (diff) | |
| download | qemu-382d34ff9fcc534db32d54eb82590de7c04f9b33.tar.gz qemu-382d34ff9fcc534db32d54eb82590de7c04f9b33.tar.xz qemu-382d34ff9fcc534db32d54eb82590de7c04f9b33.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Wed 03 Feb 2016 15:47:34 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/tracing-pull-request:
log: add "-d trace:PATTERN"
trace: switch default backend to "log"
trace: convert stderr backend to log
log: move qemu-log.c into util/ directory
log: do not unnecessarily include qom/cpu.h
trace: add "-trace help"
trace: add "-trace enable=..."
trace: no need to call trace_backend_init in different branches now
trace: split trace_init_file out of trace_init_backends
trace: split trace_init_events out of trace_init_backends
trace: fix documentation
trace: track enabled events in a separate array
trace: count number of enabled events
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/main.c')
| -rw-r--r-- | linux-user/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index f8d45778c8..e719a2da02 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -28,6 +28,7 @@ #include "qemu/timer.h" #include "qemu/envlist.h" #include "elf.h" +#include "exec/log.h" char *exec_path; |