From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91o-00074q-3h for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91l-0005rJ-05 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91k-0005r9-RS for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:12 -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 760844E32F for ; Tue, 9 Aug 2016 15:33:12 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:00 +0100 Message-Id: <1470756748-18933-33-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 32/60] trace: switch hw/nvram/ 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/nvram/ directory to include the hw/nvram/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/nvram/Makefile.objs | 2 ++ hw/nvram/ds1225y.c | 2 +- hw/nvram/fw_cfg.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 8d7b678..aca8fb0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -134,7 +134,7 @@ trace-events-subdirs += hw/audio trace-events-subdirs += hw/misc trace-events-subdirs += hw/usb trace-events-subdirs += hw/scsi -trace-events-y += hw/nvram/trace-events +trace-events-subdirs += hw/nvram trace-events-y += hw/display/trace-events trace-events-y += hw/input/trace-events trace-events-y += hw/timer/trace-events diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index e9a6694..f0ca020 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -3,3 +3,5 @@ common-obj-y += eeprom93xx.o common-obj-y += fw_cfg.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o obj-$(CONFIG_PSERIES) += spapr_nvram.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index 57d5ab2..cb4d4cc 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/nvram/trace.h" typedef struct { MemoryRegion iomem; diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 6a68e59..db155af 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -30,7 +30,7 @@ #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" #include "hw/boards.h" -#include "trace.h" +#include "hw/nvram/trace.h" #include "qemu/error-report.h" #include "qemu/config-file.h" #include "qemu/cutils.h" -- 2.7.4