diff options
| author | Peter Maydell | 2017-02-02 17:08:28 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-02 17:08:28 +0100 |
| commit | 4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7 (patch) | |
| tree | 857fc18ea95112a807196ff0af7b9202109aba2c /blockdev.c | |
| parent | Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170201' into s... (diff) | |
| parent | trace: clean up trace-events files (diff) | |
| download | qemu-4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7.tar.gz qemu-4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7.tar.xz qemu-4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7.zip | |
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 'blockdev.c')
| -rw-r--r-- | blockdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index 245e1e1d17..db82ac97e5 100644 --- a/blockdev.c +++ b/blockdev.c @@ -48,7 +48,7 @@ #include "sysemu/sysemu.h" #include "block/block_int.h" #include "qmp-commands.h" -#include "trace.h" +#include "block/trace.h" #include "sysemu/arch_init.h" #include "qemu/cutils.h" #include "qemu/help_option.h" |