Switch files in the hw/timer/ directory to include the hw/timer/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- hw/timer/Makefile.objs | 2 ++ hw/timer/aspeed_timer.c | 2 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/lm32_timer.c | 2 +- hw/timer/milkymist-sysctl.c | 2 +- hw/timer/slavio_timer.c | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 3ae5085..2c35b95 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -137,7 +137,7 @@ trace-events-subdirs += hw/scsi trace-events-subdirs += hw/nvram trace-events-subdirs += hw/display trace-events-subdirs += hw/input -trace-events-y += hw/timer/trace-events +trace-events-subdirs += hw/timer trace-events-y += hw/dma/trace-events trace-events-y += hw/sparc/trace-events trace-events-y += hw/sd/trace-events diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 7ba8c23..e764fc1 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -34,3 +34,5 @@ obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 9b70ee0..081e160 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -16,7 +16,7 @@ #include "qemu/bitops.h" #include "qemu/timer.h" #include "qemu/log.h" -#include "trace.h" +#include "hw/timer/trace.h" #define TIMER_NR_REGS 4 diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 4ed96e9..fbd81d4 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -28,7 +28,7 @@ #include "hw/ptimer.h" #include "qemu/main-loop.h" -#include "trace.h" +#include "hw/timer/trace.h" #define UNIT_REG_SIZE 16 /* Size of memory mapped regs for the unit */ #define GPTIMER_REG_SIZE 16 /* Size of memory mapped regs for a GPTimer */ diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index 2a07b59..003c68c 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/timer/trace.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "qemu/error-report.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 4488590..635b179 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -25,7 +25,7 @@ #include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" -#include "trace.h" +#include "hw/timer/trace.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "qemu/error-report.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index bfee1f3..d9ac437 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -27,7 +27,7 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/timer/trace.h" #include "qemu/main-loop.h" /* -- 2.9.3
