[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/47] trace: switch hw/input/ directory to modul
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 18/47] trace: switch hw/input/ directory to modular trace.h file |
Date: |
Fri, 6 Jan 2017 15:55:14 +0000 |
Switch files in the hw/input/ directory to include the
hw/input/trace.h file instead of the global trace.h
file.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
Makefile.objs | 2 +-
hw/input/Makefile.objs | 3 +++
hw/input/hid.c | 2 +-
hw/input/milkymist-softusb.c | 2 +-
hw/input/ps2.c | 2 +-
hw/input/virtio-input.c | 2 +-
6 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 11f7b0d..3ae5085 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -136,7 +136,7 @@ trace-events-subdirs += hw/usb
trace-events-subdirs += hw/scsi
trace-events-subdirs += hw/nvram
trace-events-subdirs += hw/display
-trace-events-y += hw/input/trace-events
+trace-events-subdirs += hw/input
trace-events-y += hw/timer/trace-events
trace-events-y += hw/dma/trace-events
trace-events-y += hw/sparc/trace-events
diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
index 7715d72..fc40638 100644
--- a/hw/input/Makefile.objs
+++ b/hw/input/Makefile.objs
@@ -17,3 +17,6 @@ endif
obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
obj-$(CONFIG_TSC210X) += tsc210x.o
+
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/hw/input/hid.c b/hw/input/hid.c
index fa9cc4c..beb595b 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -27,7 +27,7 @@
#include "ui/console.h"
#include "qemu/timer.h"
#include "hw/input/hid.h"
-#include "trace.h"
+#include "hw/input/trace.h"
#define HID_USAGE_ERROR_ROLLOVER 0x01
#define HID_USAGE_POSTFAIL 0x02
diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index 40dfca1..41f2211 100644
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -25,7 +25,7 @@
#include "qapi/error.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
-#include "trace.h"
+#include "hw/input/trace.h"
#include "ui/console.h"
#include "hw/input/hid.h"
#include "qemu/error-report.h"
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 0d14de0..845a546 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -29,7 +29,7 @@
#include "ui/input.h"
#include "sysemu/sysemu.h"
-#include "trace.h"
+#include "hw/input/trace.h"
/* debug PC keyboard */
//#define DEBUG_KBD
diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index b678ee9..517b583 100644
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -7,7 +7,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/iov.h"
-#include "trace.h"
+#include "hw/input/trace.h"
#include "hw/qdev.h"
#include "hw/virtio/virtio.h"
--
2.9.3
- [Qemu-devel] [PATCH v2 08/47] trace: switch hw/char/ directory to modular trace.h file, (continued)
- [Qemu-devel] [PATCH v2 08/47] trace: switch hw/char/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 09/47] trace: switch hw/intc/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 10/47] trace: switch hw/net/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 11/47] trace: switch hw/virtio/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 12/47] trace: switch hw/audio/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 13/47] trace: switch hw/misc/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 16/47] trace: switch hw/nvram/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 15/47] trace: switch hw/scsi/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 14/47] trace: switch hw/usb/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [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 <=
- [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, 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