From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91o-00074p-3X for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91j-0005r1-Vi for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48342) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91j-0005qL-Nd for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:11 -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 592C4C0C05AB for ; Tue, 9 Aug 2016 15:33:11 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:59 +0100 Message-Id: <1470756748-18933-32-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 31/60] trace: switch hw/scsi/ 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/scsi/ directory to include the hw/scsi/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/scsi/Makefile.objs | 3 +++ hw/scsi/esp-pci.c | 2 +- hw/scsi/esp.c | 2 +- hw/scsi/megasas.c | 2 +- hw/scsi/mptconfig.c | 2 +- hw/scsi/mptendian.c | 2 +- hw/scsi/mptsas.c | 2 +- hw/scsi/scsi-bus.c | 2 +- hw/scsi/vmw_pvscsi.c | 2 +- 10 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index e1596cb..8d7b678 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -133,7 +133,7 @@ trace-events-subdirs += hw/virtio trace-events-subdirs += hw/audio trace-events-subdirs += hw/misc trace-events-subdirs += hw/usb -trace-events-y += hw/scsi/trace-events +trace-events-subdirs += hw/scsi trace-events-y += hw/nvram/trace-events trace-events-y += hw/display/trace-events trace-events-y += hw/input/trace-events diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 5a2248b..cdf229b 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -12,3 +12,6 @@ ifeq ($(CONFIG_VIRTIO),y) obj-y += virtio-scsi.o virtio-scsi-dataplane.o obj-$(CONFIG_VHOST_SCSI) += vhost-scsi.o endif + +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 595f88b..1a94cb7 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -27,7 +27,7 @@ #include "hw/pci/pci.h" #include "hw/nvram/eeprom93xx.h" #include "hw/scsi/esp.h" -#include "trace.h" +#include "hw/scsi/trace.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 1f2f2d3..2a37377 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/scsi/esp.h" -#include "trace.h" +#include "hw/scsi/trace.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index e968302..8a8a59a 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -28,7 +28,7 @@ #include "qemu/iov.h" #include "hw/scsi/scsi.h" #include "block/scsi.h" -#include "trace.h" +#include "hw/scsi/trace.h" #include "qapi/error.h" #include "mfi.h" diff --git a/hw/scsi/mptconfig.c b/hw/scsi/mptconfig.c index 7071854..84fa3e4 100644 --- a/hw/scsi/mptconfig.c +++ b/hw/scsi/mptconfig.c @@ -22,7 +22,7 @@ #include "mptsas.h" #include "mpi.h" -#include "trace.h" +#include "hw/scsi/trace.h" /* Generic functions for marshaling and unmarshaling. */ diff --git a/hw/scsi/mptendian.c b/hw/scsi/mptendian.c index b7fe2a2..1584246 100644 --- a/hw/scsi/mptendian.c +++ b/hw/scsi/mptendian.c @@ -29,7 +29,7 @@ #include "qemu/iov.h" #include "hw/scsi/scsi.h" #include "block/scsi.h" -#include "trace.h" +#include "hw/scsi/trace.h" #include "mptsas.h" #include "mpi.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 0e0a22f..ad3021d 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -31,7 +31,7 @@ #include "qemu/iov.h" #include "hw/scsi/scsi.h" #include "block/scsi.h" -#include "trace.h" +#include "hw/scsi/trace.h" #include "qapi/error.h" #include "mptsas.h" #include "mpi.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 297216d..e79721c 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -7,7 +7,7 @@ #include "hw/qdev.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -#include "trace.h" +#include "hw/scsi/trace.h" #include "sysemu/dma.h" #include "qemu/cutils.h" diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 5116f4a..6309e8d 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -31,7 +31,7 @@ #include "block/scsi.h" #include "hw/pci/msi.h" #include "vmw_pvscsi.h" -#include "trace.h" +#include "hw/scsi/trace.h" #define PVSCSI_USE_64BIT (true) -- 2.7.4