Switch files in the block/ directory to include the block/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <[email protected]> --- Makefile.objs | 2 +- block.c | 2 +- block/Makefile.objs | 2 ++ block/backup.c | 2 +- block/block-backend.c | 2 +- block/commit.c | 2 +- block/dirty-bitmap.c | 2 +- block/io.c | 2 +- block/mirror.c | 2 +- block/nfs.c | 2 +- block/qcow2-cache.c | 2 +- block/qcow2-cluster.c | 2 +- block/qcow2.c | 2 +- block/qed-l2-cache.c | 2 +- block/qed-table.c | 2 +- block/qed.c | 2 +- block/raw-posix.c | 2 +- block/raw-win32.c | 2 +- block/stream.c | 2 +- blockdev.c | 2 +- 20 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 483430e..3ab3c10 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -124,7 +124,7 @@ trace-events-subdirs += util trace-events-subdirs += crypto trace-events-subdirs += io trace-events-subdirs += migration -trace-events-y += block/trace-events +trace-events-subdirs += block trace-events-y += hw/block/trace-events trace-events-y += hw/char/trace-events trace-events-y += hw/intc/trace-events diff --git a/block.c b/block.c index 30d64e6..e446b69 100644 --- a/block.c +++ b/block.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "block/block_int.h" #include "block/blockjob.h" #include "qemu/error-report.h" diff --git a/block/Makefile.objs b/block/Makefile.objs index 2593a2f..ebf4787 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -24,6 +24,8 @@ block-obj-y += accounting.o dirty-bitmap.o block-obj-y += write-threshold.o block-obj-y += crypto.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o common-obj-y += stream.o common-obj-y += backup.o diff --git a/block/backup.c b/block/backup.c index 2c05323..9f329d0 100644 --- a/block/backup.c +++ b/block/backup.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "block/block.h" #include "block/block_int.h" #include "block/blockjob.h" diff --git a/block/block-backend.c b/block/block-backend.c index effa038..3ed6296 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -19,7 +19,7 @@ #include "sysemu/sysemu.h" #include "qapi-event.h" #include "qemu/id.h" -#include "trace.h" +#include "block/trace.h" /* Number of coroutines to reserve per attached device model */ #define COROUTINE_POOL_RESERVATION 64 diff --git a/block/commit.c b/block/commit.c index 553e18d..5e7b6c2 100644 --- a/block/commit.c +++ b/block/commit.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "block/block_int.h" #include "block/blockjob.h" #include "qapi/error.h" diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index f2bfdcf..ea0bd35 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "trace.h" +#include "block/trace.h" #include "block/block_int.h" #include "block/blockjob.h" diff --git a/block/io.c b/block/io.c index d5493ba..1166a21 100644 --- a/block/io.c +++ b/block/io.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "sysemu/block-backend.h" #include "block/blockjob.h" #include "block/block_int.h" diff --git a/block/mirror.c b/block/mirror.c index e0b3f41..7f3acb4 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -12,7 +12,7 @@ */ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "block/blockjob.h" #include "block/block_int.h" #include "sysemu/block-backend.h" diff --git a/block/nfs.c b/block/nfs.c index 8602a44..7b92c19 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -30,7 +30,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "block/block_int.h" -#include "trace.h" +#include "block/trace.h" #include "qemu/iov.h" #include "qemu/uri.h" #include "qemu/cutils.h" diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c index 6eaefed..d22043e 100644 --- a/block/qcow2-cache.c +++ b/block/qcow2-cache.c @@ -27,7 +27,7 @@ #include "block/block_int.h" #include "qemu-common.h" #include "qcow2.h" -#include "trace.h" +#include "block/trace.h" typedef struct Qcow2CachedTable { int64_t offset; diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index f941835..22dbb4d 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -30,7 +30,7 @@ #include "block/block_int.h" #include "block/qcow2.h" #include "qemu/bswap.h" -#include "trace.h" +#include "block/trace.h" int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, bool exact_size) diff --git a/block/qcow2.c b/block/qcow2.c index 91ef4df..6f3b538 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -33,7 +33,7 @@ #include "qapi/util.h" #include "qapi/qmp/types.h" #include "qapi-event.h" -#include "trace.h" +#include "block/trace.h" #include "qemu/option_int.h" #include "qemu/cutils.h" #include "qemu/bswap.h" diff --git a/block/qed-l2-cache.c b/block/qed-l2-cache.c index 5cba794..b413753 100644 --- a/block/qed-l2-cache.c +++ b/block/qed-l2-cache.c @@ -51,7 +51,7 @@ */ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "qed.h" /* Each L2 holds 2GB so this let's us fully cache a 100GB disk */ diff --git a/block/qed-table.c b/block/qed-table.c index 1a731df..d473e85 100644 --- a/block/qed-table.c +++ b/block/qed-table.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "qemu/sockets.h" /* for EINPROGRESS on Windows */ #include "qed.h" #include "qemu/bswap.h" diff --git a/block/qed.c b/block/qed.c index 426f3cb..db2cfc9 100644 --- a/block/qed.c +++ b/block/qed.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bswap.h" -#include "trace.h" +#include "block/trace.h" #include "qed.h" #include "qapi/qmp/qerror.h" #include "migration/migration.h" diff --git a/block/raw-posix.c b/block/raw-posix.c index 6ed7547..b551db4 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "block/block_int.h" #include "qemu/module.h" -#include "trace.h" +#include "block/trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" #include "block/raw-aio.h" diff --git a/block/raw-win32.c b/block/raw-win32.c index 56f45fe..149118d 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -28,7 +28,7 @@ #include "block/block_int.h" #include "qemu/module.h" #include "block/raw-aio.h" -#include "trace.h" +#include "block/trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" #include "qapi/qmp/qstring.h" diff --git a/block/stream.c b/block/stream.c index 3187481..9289c1a 100644 --- a/block/stream.c +++ b/block/stream.c @@ -12,7 +12,7 @@ */ #include "qemu/osdep.h" -#include "trace.h" +#include "block/trace.h" #include "block/block_int.h" #include "block/blockjob.h" #include "qapi/error.h" diff --git a/blockdev.c b/blockdev.c index 2161400..347eb6e 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" -- 2.7.4
