From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPWsw-00050x-0f for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPWsv-0005Pq-Ad for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39496) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cPWsv-0005P1-4p for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:53 -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 3C6C080B56 for ; Fri, 6 Jan 2017 15:56:53 +0000 (UTC) From: "Daniel P. Berrange" Date: Fri, 6 Jan 2017 15:55:33 +0000 Message-Id: <20170106155543.12827-38-berrange@redhat.com> In-Reply-To: <20170106155543.12827-1-berrange@redhat.com> References: <20170106155543.12827-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v2 37/47] trace: switch target/arm/ 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 target/arm/ directory to include the target/arm/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- target/arm/Makefile.objs | 2 ++ target/arm/helper.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index d6125a8..dda2c04 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -155,7 +155,7 @@ trace-events-subdirs += hw/alpha trace-events-subdirs += ui trace-events-subdirs += audio trace-events-subdirs += net -trace-events-y += target/arm/trace-events +trace-events-subdirs += target/arm trace-events-y += target/i386/trace-events trace-events-y += target/sparc/trace-events trace-events-y += target/s390x/trace-events diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index 847fb52..a6bbb0e 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -10,3 +10,5 @@ obj-y += gdbstub.o obj-$(TARGET_AARCH64) += cpu64.o translate-a64.o helper-a64.o gdbstub64.o obj-y += crypto_helper.o obj-$(CONFIG_SOFTMMU) += arm-powerctl.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/target/arm/helper.c b/target/arm/helper.c index 8dcabbf..4b232e9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "trace.h" +#include "target/arm/trace.h" #include "cpu.h" #include "internals.h" #include "exec/gdbstub.h" -- 2.9.3