From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91g-0006go-3X for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91a-0005mb-4o for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91Z-0005mU-VI for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:02 -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 903B2C0624A5 for ; Tue, 9 Aug 2016 15:33:01 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:51 +0100 Message-Id: <1470756748-18933-24-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 23/60] trace: switch hw/block/ 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/block/ directory to include the hw/block/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/block/Makefile.objs | 2 ++ hw/block/dataplane/virtio-blk.c | 2 +- hw/block/hd-geometry.c | 2 +- hw/block/virtio-blk.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 3ab3c10..8fe8b71 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -125,7 +125,7 @@ trace-events-subdirs += crypto trace-events-subdirs += io trace-events-subdirs += migration trace-events-subdirs += block -trace-events-y += hw/block/trace-events +trace-events-subdirs += hw/block trace-events-y += hw/char/trace-events trace-events-y += hw/intc/trace-events trace-events-y += hw/net/trace-events diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index d4c3ab7..a2f523d 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -8,6 +8,8 @@ common-obj-$(CONFIG_XEN_BACKEND) += xen_disk.o common-obj-$(CONFIG_ECC) += ecc.o common-obj-$(CONFIG_ONENAND) += onenand.o common-obj-$(CONFIG_NVME_PCI) += nvme.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o obj-$(CONFIG_SH4) += tc58128.o diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 704a763..28e7163 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "trace.h" +#include "hw/block/trace.h" #include "qemu/iov.h" #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c index 57ad501..5d3691a 100644 --- a/hw/block/hd-geometry.c +++ b/hw/block/hd-geometry.c @@ -34,7 +34,7 @@ #include "sysemu/block-backend.h" #include "qemu/bswap.h" #include "hw/block/block.h" -#include "trace.h" +#include "hw/block/trace.h" struct partition { uint8_t boot_ind; /* 0x80 - active */ diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 331d766..856c0e3 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -16,7 +16,7 @@ #include "qemu-common.h" #include "qemu/iov.h" #include "qemu/error-report.h" -#include "trace.h" +#include "hw/block/trace.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -- 2.7.4