[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.8 v1 31/60] trace: switch hw/scsi/ directory t
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH for-2.8 v1 31/60] trace: switch hw/scsi/ directory to modular trace.h file |
Date: |
Tue, 9 Aug 2016 16:31:59 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH for-2.8 v1 26/60] trace: switch hw/net/ directory to modular trace.h file, (continued)
- [Qemu-devel] [PATCH for-2.8 v1 26/60] trace: switch hw/net/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 25/60] trace: switch hw/intc/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 28/60] trace: switch hw/audio/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 30/60] trace: switch hw/usb/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 21/60] trace: switch migration/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 27/60] trace: switch hw/virtio/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 32/60] trace: switch hw/nvram/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 23/60] trace: switch hw/block/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 29/60] trace: switch hw/misc/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 34/60] trace: switch hw/input/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 31/60] trace: switch hw/scsi/ directory to modular trace.h file,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH for-2.8 v1 33/60] trace: switch hw/display/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 35/60] trace: switch hw/timer/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 38/60] trace: switch hw/sd/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 40/60] trace: switch hw/mem/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 36/60] trace: switch hw/dma/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 37/60] trace: switch hw/sparc/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 39/60] trace: switch hw/isa/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 41/60] trace: switch hw/i386/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 42/60] trace: switch hw/9pfs/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 43/60] trace: switch hw/ppc/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09