Switch files in the hw/alpha/ directory to include the hw/alpha/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- hw/alpha/Makefile.objs | 2 ++ hw/alpha/pci.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index fbcf040..510083c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -151,7 +151,7 @@ trace-events-subdirs += hw/s390x trace-events-subdirs += hw/vfio trace-events-subdirs += hw/acpi trace-events-subdirs += hw/arm -trace-events-y += hw/alpha/trace-events +trace-events-subdirs += hw/alpha trace-events-y += ui/trace-events trace-events-y += audio/trace-events trace-events-y += net/trace-events diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs index 5c74275..e8e0573 100644 --- a/hw/alpha/Makefile.objs +++ b/hw/alpha/Makefile.objs @@ -1 +1,3 @@ obj-y += dp264.o pci.o typhoon.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c index 8dde637..3fafb1b 100644 --- a/hw/alpha/pci.c +++ b/hw/alpha/pci.c @@ -11,7 +11,7 @@ #include "alpha_sys.h" #include "qemu/log.h" #include "sysemu/sysemu.h" -#include "trace.h" +#include "hw/alpha/trace.h" /* Fallback for unassigned PCI I/O operations. Avoids MCHK. */ -- 2.7.4
