From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92F-0007bn-3S 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 1bX92B-0005zu-Gf for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92B-0005zp-82 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:39 -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 D76523B72D for ; Tue, 9 Aug 2016 15:33:38 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:23 +0100 Message-Id: <1470756748-18933-56-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 55/60] trace: switch target-s390x/ 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-s390x/ directory to include the target-s390x/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- target-s390x/Makefile.objs | 2 ++ target-s390x/cpu.c | 2 +- target-s390x/ioinst.c | 2 +- target-s390x/kvm.c | 2 +- target-s390x/mmu_helper.c | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 9cddc6d..5734475 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -157,7 +157,7 @@ trace-events-subdirs += audio trace-events-subdirs += net trace-events-subdirs += target-i386 trace-events-subdirs += target-sparc -trace-events-y += target-s390x/trace-events +trace-events-subdirs += target-s390x trace-events-y += target-ppc/trace-events trace-events-y += qom/trace-events trace-events-y += linux-user/trace-events diff --git a/target-s390x/Makefile.objs b/target-s390x/Makefile.objs index dd62cbd..97bfbfd 100644 --- a/target-s390x/Makefile.objs +++ b/target-s390x/Makefile.objs @@ -3,3 +3,5 @@ obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o obj-y += gdbstub.o obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o obj-$(CONFIG_KVM) += kvm.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index e43e2d6..1d93d03 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -30,7 +30,7 @@ #include "qemu/cutils.h" #include "qemu/timer.h" #include "qemu/error-report.h" -#include "trace.h" +#include "target-s390x/trace.h" #include "qapi/visitor.h" #include "migration/vmstate.h" #include "exec/exec-all.h" diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index a5a288b..43c3a96 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -13,7 +13,7 @@ #include "cpu.h" #include "hw/s390x/ioinst.h" -#include "trace.h" +#include "target-s390x/trace.h" #include "hw/s390x/s390-pci-bus.h" int ioinst_disassemble_sch_ident(uint32_t value, int *m, int *cssid, int *ssid, diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 80ac621..7732ae5 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -38,7 +38,7 @@ #include "qapi/qmp/qjson.h" #include "exec/gdbstub.h" #include "exec/address-spaces.h" -#include "trace.h" +#include "target-s390x/trace.h" #include "qapi-event.h" #include "hw/s390x/s390-pci-inst.h" #include "hw/s390x/s390-pci-bus.h" diff --git a/target-s390x/mmu_helper.c b/target-s390x/mmu_helper.c index b11a027..5ebf8d8 100644 --- a/target-s390x/mmu_helper.c +++ b/target-s390x/mmu_helper.c @@ -20,7 +20,7 @@ #include "exec/address-spaces.h" #include "cpu.h" #include "sysemu/kvm.h" -#include "trace.h" +#include "target-s390x/trace.h" #include "hw/s390x/storage-keys.h" /* #define DEBUG_S390 */ -- 2.7.4