Switch files in the hw/char/ directory to include the hw/char/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- hw/char/Makefile.objs | 2 ++ hw/char/escc.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/virtio-serial-bus.c | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 8fe8b71..ad44cbc 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -126,7 +126,7 @@ trace-events-subdirs += io trace-events-subdirs += migration trace-events-subdirs += block trace-events-subdirs += hw/block -trace-events-y += hw/char/trace-events +trace-events-subdirs += hw/char trace-events-y += hw/intc/trace-events trace-events-y += hw/net/trace-events trace-events-y += hw/virtio/trace-events diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index 69a553c..13db97f 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -26,5 +26,7 @@ common-obj-$(CONFIG_LM32) += lm32_juart.o common-obj-$(CONFIG_LM32) += lm32_uart.o common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o diff --git a/hw/char/escc.c b/hw/char/escc.c index 31a5f90..f004b3c 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -29,7 +29,7 @@ #include "sysemu/char.h" #include "ui/console.h" #include "ui/input.h" -#include "trace.h" +#include "hw/char/trace.h" /* * Chipset docs: diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 871524c..9212361 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "sysemu/char.h" -#include "trace.h" +#include "hw/char/trace.h" #define UART_REG_SIZE 20 /* Size of memory mapped registers */ diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 28c2cf7..bdab1b7 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/char/trace.h" #include "sysemu/char.h" #include "hw/char/lm32_juart.h" diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index b5c760d..2ca5678 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/char/trace.h" #include "sysemu/char.h" #include "qemu/error-report.h" diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index baddb37..9f5d5e4 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/char/trace.h" #include "sysemu/char.h" #include "qemu/error-report.h" diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 2e36481..b5e28e1 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "sysemu/char.h" #include "qemu/error-report.h" -#include "trace.h" +#include "hw/char/trace.h" #include "hw/virtio/virtio-serial.h" #include "qapi-event.h" diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index db57a38..28cab84 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -25,7 +25,7 @@ #include "qemu/error-report.h" #include "qemu/queue.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/char/trace.h" #include "hw/virtio/virtio-serial.h" #include "hw/virtio/virtio-access.h" -- 2.7.4
