Switch files in the migration/ directory to include the migration/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <[email protected]> --- Makefile.objs | 2 +- migration/Makefile.objs | 2 ++ migration/exec.c | 2 +- migration/fd.c | 2 +- migration/migration.c | 2 +- migration/postcopy-ram.c | 2 +- migration/qemu-file.c | 2 +- migration/ram.c | 2 +- migration/rdma.c | 2 +- migration/savevm.c | 2 +- migration/socket.c | 2 +- migration/tls.c | 2 +- migration/vmstate.c | 2 +- 13 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 99e7c1f..483430e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -123,7 +123,7 @@ trace-events-y = trace-events trace-events-subdirs += util trace-events-subdirs += crypto trace-events-subdirs += io -trace-events-y += migration/trace-events +trace-events-subdirs += migration trace-events-y += block/trace-events trace-events-y += hw/block/trace-events trace-events-y += hw/char/trace-events diff --git a/migration/Makefile.objs b/migration/Makefile.objs index 30ad945..33517a8 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -10,3 +10,5 @@ common-obj-$(CONFIG_RDMA) += rdma.o common-obj-y += block.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/migration/exec.c b/migration/exec.c index 2af63cc..a7f1e70 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -22,7 +22,7 @@ #include "qemu-common.h" #include "migration/migration.h" #include "io/channel-command.h" -#include "trace.h" +#include "migration/trace.h" void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) diff --git a/migration/fd.c b/migration/fd.c index 84a10fd..03bd2d6 100644 --- a/migration/fd.c +++ b/migration/fd.c @@ -20,7 +20,7 @@ #include "migration/migration.h" #include "monitor/monitor.h" #include "io/channel-util.h" -#include "trace.h" +#include "migration/trace.h" void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp) diff --git a/migration/migration.c b/migration/migration.c index 955d5ee..635547b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -29,7 +29,7 @@ #include "migration/postcopy-ram.h" #include "qemu/thread.h" #include "qmp-commands.h" -#include "trace.h" +#include "migration/trace.h" #include "qapi-event.h" #include "qom/cpu.h" #include "exec/memory.h" diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index abe8c60..e0eb218 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -24,7 +24,7 @@ #include "sysemu/sysemu.h" #include "sysemu/balloon.h" #include "qemu/error-report.h" -#include "trace.h" +#include "migration/trace.h" /* Arbitrary limit on size of each discard command, * keeps them around ~200 bytes diff --git a/migration/qemu-file.c b/migration/qemu-file.c index bbc565e..96de887 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -30,7 +30,7 @@ #include "qemu/coroutine.h" #include "migration/migration.h" #include "migration/qemu-file.h" -#include "trace.h" +#include "migration/trace.h" #define IO_BUF_SIZE 32768 #define MAX_IOV_SIZE MIN(IOV_MAX, 64) diff --git a/migration/ram.c b/migration/ram.c index 815bc0e..5500cb5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -40,7 +40,7 @@ #include "exec/address-spaces.h" #include "migration/page_cache.h" #include "qemu/error-report.h" -#include "trace.h" +#include "migration/trace.h" #include "exec/ram_addr.h" #include "qemu/rcu_queue.h" diff --git a/migration/rdma.c b/migration/rdma.c index 5110ec8..71c19df 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -29,7 +29,7 @@ #include <netdb.h> #include <arpa/inet.h> #include <rdma/rdma_cma.h> -#include "trace.h" +#include "migration/trace.h" /* * Print and error on both the Monitor and the Log file. diff --git a/migration/savevm.c b/migration/savevm.c index 33a2911..6bd108b 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -46,7 +46,7 @@ #include "sysemu/cpus.h" #include "exec/memory.h" #include "qmp-commands.h" -#include "trace.h" +#include "migration/trace.h" #include "qemu/bitops.h" #include "qemu/iov.h" #include "block/snapshot.h" diff --git a/migration/socket.c b/migration/socket.c index 5c0a38f..71b0573 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -22,7 +22,7 @@ #include "migration/migration.h" #include "migration/qemu-file.h" #include "io/channel-socket.h" -#include "trace.h" +#include "migration/trace.h" static SocketAddress *tcp_build_address(const char *host_port, Error **errp) diff --git a/migration/tls.c b/migration/tls.c index 12c053d..fa61aef 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -24,7 +24,7 @@ #include "crypto/tlscreds.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "trace.h" +#include "migration/trace.h" static QCryptoTLSCreds * migration_tls_get_creds(MigrationState *s, diff --git a/migration/vmstate.c b/migration/vmstate.c index fc29acf..6d65b44 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -5,7 +5,7 @@ #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/error-report.h" -#include "trace.h" +#include "migration/trace.h" static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, void *opaque, QJSON *vmdesc); -- 2.7.4
