From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPWsL-000426-LN for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPWsK-00050F-Rc for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55760) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cPWsK-0004zu-LO for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:16 -0500 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 AE306C04B941 for ; Fri, 6 Jan 2017 15:56:16 +0000 (UTC) From: "Daniel P. Berrange" Date: Fri, 6 Jan 2017 15:55:12 +0000 Message-Id: <20170106155543.12827-17-berrange@redhat.com> In-Reply-To: <20170106155543.12827-1-berrange@redhat.com> References: <20170106155543.12827-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v2 16/47] 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 0d3b37a..a08e1f9 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 c018f6b..212c4cc 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -4,3 +4,5 @@ common-obj-y += fw_cfg.o common-obj-y += chrp_nvram.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 3ebecb2..0247171 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -29,7 +29,7 @@ #include "hw/isa/isa.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/nvram/trace.h" #include "qemu/error-report.h" #include "qemu/config-file.h" #include "qemu/cutils.h" -- 2.9.3