diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-02 16:08:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-02 16:08:28 +0000 |
| commit | 4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7 (patch) | |
| tree | 857fc18ea95112a807196ff0af7b9202109aba2c /spice-qemu-char.c | |
| parent | 0b17d809b08e0315430d2e2923dbe4e967ef4f63 (diff) | |
| parent | 7f4076c1bb16d0d6f81a085ecc9c9d0b9da74c7d (diff) | |
| download | qemu-4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Wed 01 Feb 2017 13:44:32 GMT
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace: clean up trace-events files
qapi: add missing trace_visit_type_enum() call
trace: improve error reporting when parsing simpletrace header
trace: update docs to reflect new code generation approach
trace: switch to modular code generation for sub-directories
trace: move setting of group name into Makefiles
trace: move hw/i386/xen events to correct subdir
trace: move hw/xen events to correct subdir
trace: move hw/block/dataplane events to correct subdir
make: move top level dir to end of include search path
# Conflicts:
# Makefile
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'spice-qemu-char.c')
| -rw-r--r-- | spice-qemu-char.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spice-qemu-char.c b/spice-qemu-char.c index adfa55b55c..6f46f46b25 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "trace.h" +#include "trace-root.h" #include "ui/qemu-spice.h" #include "sysemu/char.h" #include "qemu/error-report.h" |