[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 27/47] trace: switch hw/ppc/ directory to modular
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 27/47] trace: switch hw/ppc/ directory to modular trace.h file |
Date: |
Fri, 6 Jan 2017 15:55:23 +0000 |
Switch files in the hw/ppc/ directory to include the
hw/ppc/trace.h file instead of the global trace.h
file.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
Makefile.objs | 2 +-
hw/ppc/Makefile.objs | 3 +++
hw/ppc/ppc.c | 2 +-
hw/ppc/prep.c | 2 +-
hw/ppc/spapr.c | 2 +-
hw/ppc/spapr_hcall.c | 2 +-
hw/ppc/spapr_iommu.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/ppc/spapr_rtas_ddw.c | 2 +-
9 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 83906e5..42cd94e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -145,7 +145,7 @@ trace-events-subdirs += hw/isa
trace-events-subdirs += hw/mem
trace-events-subdirs += hw/i386
trace-events-subdirs += hw/9pfs
-trace-events-y += hw/ppc/trace-events
+trace-events-subdirs += hw/ppc
trace-events-y += hw/pci/trace-events
trace-events-y += hw/s390x/trace-events
trace-events-y += hw/vfio/trace-events
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 8025129..071428c 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -25,3 +25,6 @@ obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
# PowerPC 440 Xilinx ML507 reference board.
obj-$(CONFIG_XILINX) += virtex_ml507.o
+
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index 8945869..53302e8 100644
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -37,7 +37,7 @@
#include "hw/loader.h"
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
-#include "trace.h"
+#include "hw/ppc/trace.h"
//#define PPC_DEBUG_IRQ
//#define PPC_DEBUG_TB
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 054af1e..c5c97b1 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -45,7 +45,7 @@
#include "sysemu/arch_init.h"
#include "sysemu/qtest.h"
#include "exec/address-spaces.h"
-#include "trace.h"
+#include "hw/ppc/trace.h"
#include "elf.h"
#include "qemu/cutils.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 208ef7b..ebdcf6f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -61,7 +61,7 @@
#include "hw/usb.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
-#include "trace.h"
+#include "hw/ppc/trace.h"
#include "hw/nmi.h"
#include "hw/compat.h"
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 9a9bedf..332a49a 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -8,7 +8,7 @@
#include "hw/ppc/spapr.h"
#include "mmu-hash64.h"
#include "cpu-models.h"
-#include "trace.h"
+#include "hw/ppc/trace.h"
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "hw/ppc/spapr_ovec.h"
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index ae30bbe..125682d 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -25,7 +25,7 @@
#include "kvm_ppc.h"
#include "sysemu/dma.h"
#include "exec/address-spaces.h"
-#include "trace.h"
+#include "hw/ppc/trace.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index fd6fc1d..1acb5b4 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -37,7 +37,7 @@
#include "exec/address-spaces.h"
#include "exec/ram_addr.h"
#include <libfdt.h>
-#include "trace.h"
+#include "hw/ppc/trace.h"
#include "qemu/error-report.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/ppc/spapr_rtas_ddw.c b/hw/ppc/spapr_rtas_ddw.c
index 177dcff..3dad98c 100644
--- a/hw/ppc/spapr_rtas_ddw.c
+++ b/hw/ppc/spapr_rtas_ddw.c
@@ -22,7 +22,7 @@
#include "qemu/error-report.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
-#include "trace.h"
+#include "hw/ppc/trace.h"
static int spapr_phb_get_active_win_num_cb(Object *child, void *opaque)
{
--
2.9.3
- [Qemu-devel] [PATCH v2 17/47] trace: switch hw/display/ directory to modular trace.h file, (continued)
- [Qemu-devel] [PATCH v2 17/47] trace: switch hw/display/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 18/47] trace: switch hw/input/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 19/47] trace: switch hw/timer/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 23/47] trace: switch hw/isa/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 21/47] trace: switch hw/sparc/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 22/47] trace: switch hw/sd/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 20/47] trace: switch hw/dma/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 24/47] trace: switch hw/mem/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 25/47] trace: switch hw/i386/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 26/47] trace: switch hw/9pfs/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 27/47] trace: switch hw/ppc/ directory to modular trace.h file,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v2 29/47] trace: switch hw/s390x/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 28/47] trace: switch hw/pci/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 30/47] trace: switch hw/vfio/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 31/47] trace: switch hw/acpi/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 32/47] trace: switch hw/arm/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 33/47] trace: switch hw/alpha/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 34/47] trace: switch ui/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 35/47] trace: switch audio/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 36/47] trace: switch net/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 37/47] trace: switch target/arm/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06