The following changes since commit c65db7705b7926f4a084b93778e4bd5dd3990aad:
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-for-peter-2016-02-02' into staging (2016-02-02 18:04:04 +0000) are available in the git repository at: git://github.com/stefanha/qemu.git tags/tracing-pull-request for you to fetch changes up to c84ea00dc29b2084a62bd31f498ed0f245d3848e: log: add "-d trace:PATTERN" (2016-02-03 10:37:50 +0000) ---------------------------------------------------------------- ---------------------------------------------------------------- Denis V. Lunev (2): trace: no need to call trace_backend_init in different branches now log: move qemu-log.c into util/ directory Paolo Bonzini (11): trace: count number of enabled events trace: track enabled events in a separate array trace: fix documentation trace: split trace_init_events out of trace_init_backends trace: split trace_init_file out of trace_init_backends trace: add "-trace enable=..." trace: add "-trace help" log: do not unnecessarily include qom/cpu.h trace: convert stderr backend to log trace: switch default backend to "log" log: add "-d trace:PATTERN" .travis.yml | 2 +- Makefile.objs | 1 - bsd-user/main.c | 1 + configure | 6 +- cpu-exec.c | 1 + exec.c | 1 + hw/acpi/cpu_hotplug.c | 1 + hw/timer/a9gtimer.c | 1 + include/exec/log.h | 60 +++++++++++ include/qemu/log.h | 60 +---------- linux-user/main.c | 1 + qemu-io.c | 2 +- qemu-log.c | 179 -------------------------------- qemu-options.hx | 22 ++-- qom/cpu.c | 1 + scripts/tracetool/backend/log.py | 48 +++++++++ scripts/tracetool/backend/stderr.py | 47 --------- scripts/tracetool/format/events_c.py | 2 +- target-alpha/translate.c | 1 + target-arm/translate-a64.c | 1 + target-arm/translate.c | 1 + target-cris/translate.c | 1 + target-i386/seg_helper.c | 1 + target-i386/smm_helper.c | 1 + target-i386/translate.c | 1 + target-lm32/helper.c | 1 + target-lm32/translate.c | 1 + target-m68k/translate.c | 1 + target-microblaze/helper.c | 1 + target-microblaze/translate.c | 1 + target-mips/helper.c | 1 + target-mips/translate.c | 1 + target-moxie/translate.c | 1 + target-openrisc/translate.c | 1 + target-ppc/mmu-hash32.c | 1 + target-ppc/mmu-hash64.c | 1 + target-ppc/mmu_helper.c | 1 + target-ppc/translate.c | 1 + target-s390x/translate.c | 1 + target-sh4/helper.c | 1 + target-sh4/translate.c | 1 + target-sparc/int32_helper.c | 1 + target-sparc/int64_helper.c | 1 + target-sparc/translate.c | 1 + target-tilegx/translate.c | 1 + target-tricore/translate.c | 1 + target-unicore32/translate.c | 1 + target-xtensa/translate.c | 1 + tcg/tcg.c | 1 + trace/control-internal.h | 15 ++- trace/control.c | 98 +++++++++++++----- trace/control.h | 44 +++++++- trace/event-internal.h | 2 - trace/simple.c | 6 +- trace/simple.h | 4 +- translate-all.c | 1 + util/Makefile.objs | 1 + util/log.c | 192 +++++++++++++++++++++++++++++++++++ vl.c | 38 ++++--- 59 files changed, 512 insertions(+), 356 deletions(-) create mode 100644 include/exec/log.h delete mode 100644 qemu-log.c create mode 100644 scripts/tracetool/backend/log.py delete mode 100644 scripts/tracetool/backend/stderr.py create mode 100644 util/log.c -- 2.5.0
