Switch files in the hw/9pfs/ directory to include the hw/9pfs/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- hw/9pfs/9p.c | 2 +- hw/9pfs/Makefile.objs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 1dc55aa..4734bac 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -144,7 +144,7 @@ trace-events-subdirs += hw/sd trace-events-subdirs += hw/isa trace-events-subdirs += hw/mem trace-events-subdirs += hw/i386 -trace-events-y += hw/9pfs/trace-events +trace-events-subdirs += hw/9pfs trace-events-y += hw/ppc/trace-events trace-events-y += hw/pci/trace-events trace-events-y += hw/s390x/trace-events diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index b6b02b4..2531c82 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -21,7 +21,7 @@ #include "fsdev/qemu-fsdev.h" #include "9p-xattr.h" #include "coth.h" -#include "trace.h" +#include "hw/9pfs/trace.h" #include "migration/migration.h" int open_fd_hw; diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index da0ae0c..28eb2e5 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -7,3 +7,5 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o common-obj-y += 9p-proxy.o obj-y += virtio-9p-device.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o -- 2.7.4
