From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91j-0006pL-Nt for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91h-0005pF-FV for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91h-0005pA-7N for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:09 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CEC6D3B3E7 for ; Tue, 9 Aug 2016 15:33:08 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:57 +0100 Message-Id: <1470756748-18933-30-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 29/60] trace: switch hw/misc/ directory to modular trace.h file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" Switch files in the hw/misc/ directory to include the hw/misc/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/misc/Makefile.objs | 3 +++ hw/misc/aspeed_scu.c | 2 +- hw/misc/eccmemctl.c | 2 +- hw/misc/milkymist-hpdmc.c | 2 +- hw/misc/milkymist-pfpu.c | 2 +- hw/misc/slavio_misc.c | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 80f91ee..ec58269 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -131,7 +131,7 @@ trace-events-subdirs += hw/intc trace-events-subdirs += hw/net trace-events-subdirs += hw/virtio trace-events-subdirs += hw/audio -trace-events-y += hw/misc/trace-events +trace-events-subdirs += hw/misc trace-events-y += hw/usb/trace-events trace-events-y += hw/scsi/trace-events trace-events-y += hw/nvram/trace-events diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 4cfbd10..9251f6d 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -53,3 +53,6 @@ obj-$(CONFIG_EDU) += edu.o obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o obj-$(CONFIG_AUX) += auxbus.o obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o + +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index c7e2c82..0adbec1 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -16,7 +16,7 @@ #include "qapi/visitor.h" #include "qemu/bitops.h" #include "qemu/log.h" -#include "trace.h" +#include "hw/misc/trace.h" #define TO_REG(offset) ((offset) >> 2) diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index a0071f3..a0424f9 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/misc/trace.h" /* There are 3 versions of this chip used in SMP sun4m systems: * MCC (version 0, implementation 0) SS-600MP diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c index e6140ee..8596437 100644 --- a/hw/misc/milkymist-hpdmc.c +++ b/hw/misc/milkymist-hpdmc.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/misc/trace.h" #include "qemu/error-report.h" enum { diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index 1da21a6..f95e2f4 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/misc/trace.h" #include "qemu/log.h" #include "qemu/error-report.h" #include diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index edd5de0..a4820c5 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/misc/trace.h" /* * This is the auxio port, chip control and system control part of -- 2.7.4