[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 31/47] trace: switch hw/acpi/ directory to modula
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 31/47] trace: switch hw/acpi/ directory to modular trace.h file |
Date: |
Fri, 6 Jan 2017 15:55:27 +0000 |
Switch files in the hw/acpi/ directory to include the
hw/acpi/trace.h file instead of the global trace.h
file.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
Makefile.objs | 2 +-
hw/acpi/Makefile.objs | 2 ++
hw/acpi/cpu.c | 2 +-
hw/acpi/memory_hotplug.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index cea70ce..86c62cd 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -149,7 +149,7 @@ trace-events-subdirs += hw/ppc
trace-events-subdirs += hw/pci
trace-events-subdirs += hw/s390x
trace-events-subdirs += hw/vfio
-trace-events-y += hw/acpi/trace-events
+trace-events-subdirs += hw/acpi
trace-events-y += hw/arm/trace-events
trace-events-y += hw/alpha/trace-events
trace-events-y += ui/trace-events
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 489e63b..abdc809 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -8,3 +8,5 @@ common-obj-$(CONFIG_ACPI) += acpi_interface.o
common-obj-$(CONFIG_ACPI) += bios-linker-loader.o
common-obj-$(CONFIG_ACPI) += aml-build.o
common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
index 5ac89fe..68e1c0f 100644
--- a/hw/acpi/cpu.c
+++ b/hw/acpi/cpu.c
@@ -3,7 +3,7 @@
#include "hw/acpi/cpu.h"
#include "qapi/error.h"
#include "qapi-event.h"
-#include "trace.h"
+#include "hw/acpi/trace.h"
#include "sysemu/numa.h"
#define ACPI_CPU_HOTPLUG_REG_LEN 12
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index ec4e64b..e442970 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -4,7 +4,7 @@
#include "hw/mem/pc-dimm.h"
#include "hw/boards.h"
#include "hw/qdev-core.h"
-#include "trace.h"
+#include "hw/acpi/trace.h"
#include "qapi-event.h"
static ACPIOSTInfo *acpi_memory_device_status(int slot, MemStatus *mdev)
--
2.9.3
- [Qemu-devel] [PATCH v2 21/47] trace: switch hw/sparc/ directory to modular trace.h file, (continued)
- [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, 2017/01/06
- [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 <=
- [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
- [Qemu-devel] [PATCH v2 38/47] trace: switch target/i386/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 41/47] trace: switch target/ppc/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 39/47] trace: switch target/sparc/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 42/47] trace: switch qom/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06