From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX923-0007Q7-0c for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX920-0005wd-3C for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43548) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91z-0005wZ-Tb for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:28 -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 84195550B1 for ; Tue, 9 Aug 2016 15:33:27 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:13 +0100 Message-Id: <1470756748-18933-46-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 45/60] trace: switch hw/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 hw/s390x/ directory to include the hw/s390x/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/s390x/Makefile.objs | 3 +++ hw/s390x/css.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index d63efb2..296c824 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -147,7 +147,7 @@ trace-events-subdirs += hw/i386 trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/ppc trace-events-subdirs += hw/pci -trace-events-y += hw/s390x/trace-events +trace-events-subdirs += hw/s390x trace-events-y += hw/vfio/trace-events trace-events-y += hw/acpi/trace-events trace-events-y += hw/arm/trace-events diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index 41ac4ec..ac66483 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -13,3 +13,6 @@ obj-y += ccw-device.o obj-y += s390-pci-bus.o s390-pci-inst.o obj-y += s390-skeys.o obj-$(CONFIG_KVM) += s390-skeys-kvm.o + +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/s390x/css.c b/hw/s390x/css.c index bb8e4be..c0c3c48 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -18,7 +18,7 @@ #include "cpu.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/css.h" -#include "trace.h" +#include "hw/s390x/trace.h" #include "hw/s390x/s390_flic.h" typedef struct CrwContainer { diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a554a24..e489277 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -32,7 +32,7 @@ #include "hw/s390x/ioinst.h" #include "hw/s390x/css.h" #include "virtio-ccw.h" -#include "trace.h" +#include "hw/s390x/trace.h" #include "hw/s390x/css-bridge.h" static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size, -- 2.7.4