@@ -132,7 +132,7 @@ trace-events-subdirs += hw/net
trace-events-subdirs += hw/virtio
trace-events-subdirs += hw/audio
trace-events-subdirs += hw/misc
-trace-events-y += hw/usb/trace-events
+trace-events-subdirs += hw/usb
trace-events-y += hw/scsi/trace-events
trace-events-y += hw/nvram/trace-events
trace-events-y += hw/display/trace-events
@@ -42,3 +42,6 @@ common-obj-y += $(patsubst %,host-%.o,$(HOST_USB))
ifeq ($(CONFIG_USB_LIBUSB),y)
common-obj-$(CONFIG_XEN_BACKEND) += xen-usb.o
endif
+
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
@@ -6,7 +6,7 @@
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#include "qemu/cutils.h"
static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent);
@@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "hw/usb.h"
#include "qemu/iov.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
static void usb_combined_packet_add(USBCombinedPacket *combined, USBPacket *p)
{
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "hw/usb.h"
#include "qemu/iov.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
void usb_pick_speed(USBPort *port)
{
@@ -2,7 +2,7 @@
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
/* ------------------------------------------------------------------ */
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "qemu/error-report.h"
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "qemu/iov.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#include "qemu/error-report.h"
#include "hw/usb.h"
@@ -31,7 +31,7 @@
#include "qapi/error.h"
#include "hw/usb/ehci-regs.h"
#include "hw/usb/hcd-ehci.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#define FRAME_TIMER_FREQ 1000
#define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ)
@@ -33,7 +33,7 @@
#include "hw/pci/pci.h"
#include "hw/sysbus.h"
#include "hw/qdev-dma.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
/* This causes frames to occur 1000x slower */
//#define OHCI_TIME_WARP 1
@@ -34,7 +34,7 @@
#include "qemu/timer.h"
#include "qemu/iov.h"
#include "sysemu/dma.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#include "qemu/main-loop.h"
#define FRAME_TIMER_FREQ 1000
@@ -26,7 +26,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#include "qapi/error.h"
//#define DEBUG_XHCI
@@ -44,7 +44,7 @@
#include "monitor/monitor.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
-#include "trace.h"
+#include "hw/usb/trace.h"
#include "hw/usb.h"
Switch files in the hw/usb/ directory to include the hw/usb/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- Makefile.objs | 2 +- hw/usb/Makefile.objs | 3 +++ hw/usb/bus.c | 2 +- hw/usb/combined-packet.c | 2 +- hw/usb/core.c | 2 +- hw/usb/desc.c | 2 +- hw/usb/dev-hub.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/dev-uas.c | 2 +- hw/usb/hcd-ehci.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-uhci.c | 2 +- hw/usb/hcd-xhci.c | 2 +- hw/usb/host-libusb.c | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-)