From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92H-0007br-IJ for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX92E-00060z-V4 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92E-00060i-Ky for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:42 -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 47C4EC0567A2 for ; Tue, 9 Aug 2016 15:33:38 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:22 +0100 Message-Id: <1470756748-18933-55-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 54/60] trace: switch target-sparc/ 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-sparc/ directory to include the target-sparc/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- target-sparc/Makefile.objs | 2 ++ target-sparc/int32_helper.c | 2 +- target-sparc/int64_helper.c | 2 +- target-sparc/mmu_helper.c | 2 +- target-sparc/win_helper.c | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 3fc6365..9cddc6d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -156,7 +156,7 @@ trace-events-subdirs += ui trace-events-subdirs += audio trace-events-subdirs += net trace-events-subdirs += target-i386 -trace-events-y += target-sparc/trace-events +trace-events-subdirs += target-sparc trace-events-y += target-s390x/trace-events trace-events-y += target-ppc/trace-events trace-events-y += qom/trace-events diff --git a/target-sparc/Makefile.objs b/target-sparc/Makefile.objs index ec90569..0ca6e73 100644 --- a/target-sparc/Makefile.objs +++ b/target-sparc/Makefile.objs @@ -5,3 +5,5 @@ obj-$(TARGET_SPARC) += int32_helper.o obj-$(TARGET_SPARC64) += int64_helper.o obj-$(TARGET_SPARC64) += vis_helper.o obj-y += gdbstub.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/target-sparc/int32_helper.c b/target-sparc/int32_helper.c index 09afe13..d930e10 100644 --- a/target-sparc/int32_helper.c +++ b/target-sparc/int32_helper.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "trace.h" +#include "target-sparc/trace.h" #include "sysemu/sysemu.h" #include "exec/log.h" diff --git a/target-sparc/int64_helper.c b/target-sparc/int64_helper.c index 29360fa..5b9f2ce 100644 --- a/target-sparc/int64_helper.c +++ b/target-sparc/int64_helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/log.h" -#include "trace.h" +#include "target-sparc/trace.h" #define DEBUG_PCALL diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c index 32b629f..dcafe3a 100644 --- a/target-sparc/mmu_helper.c +++ b/target-sparc/mmu_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "trace.h" +#include "target-sparc/trace.h" #include "exec/address-spaces.h" /* Sparc MMU emulation */ diff --git a/target-sparc/win_helper.c b/target-sparc/win_helper.c index a8a6c0c..f95ecc3 100644 --- a/target-sparc/win_helper.c +++ b/target-sparc/win_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "trace.h" +#include "target-sparc/trace.h" static inline void memcpy32(target_ulong *dst, const target_ulong *src) { -- 2.7.4