From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91r-0007D9-Hw for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91o-0005sa-F7 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91o-0005sM-6x for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:16 -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 CE5F28B120 for ; Tue, 9 Aug 2016 15:33:15 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:03 +0100 Message-Id: <1470756748-18933-36-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 35/60] trace: switch hw/timer/ 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/timer/ directory to include the hw/timer/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- 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 49cc98c..553c738 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 dd000f5..cb0f13e 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -29,7 +29,7 @@ #include "qemu/timer.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 e45a65b..c6c0d95 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 2194832..789c11c 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 fb3e08b..afc44f6 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.7.4