From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92F-0007bo-3m 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 1bX92C-000607-HQ for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92C-000602-Br for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:40 -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 F25774E32F for ; Tue, 9 Aug 2016 15:33:39 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:24 +0100 Message-Id: <1470756748-18933-57-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 56/60] trace: switch target-ppc/ 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-ppc/ directory to include the target-ppc/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- target-ppc/Makefile.objs | 2 ++ target-ppc/kvm.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 5734475..9ba93dd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -158,7 +158,7 @@ trace-events-subdirs += net trace-events-subdirs += target-i386 trace-events-subdirs += target-sparc trace-events-subdirs += target-s390x -trace-events-y += target-ppc/trace-events +trace-events-subdirs += target-ppc trace-events-y += qom/trace-events trace-events-y += linux-user/trace-events diff --git a/target-ppc/Makefile.objs b/target-ppc/Makefile.objs index e667e69..7a71b38 100644 --- a/target-ppc/Makefile.objs +++ b/target-ppc/Makefile.objs @@ -15,3 +15,5 @@ obj-y += misc_helper.o obj-y += mem_helper.o obj-$(CONFIG_USER_ONLY) += user_only_helper.o obj-y += gdbstub.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 84764ed..7d55145 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -38,7 +38,7 @@ #include "hw/ppc/spapr_vio.h" #include "hw/ppc/ppc.h" #include "sysemu/watchdog.h" -#include "trace.h" +#include "target-ppc/trace.h" #include "exec/gdbstub.h" #include "exec/memattrs.h" #include "sysemu/hostmem.h" -- 2.7.4