@@ -128,7 +128,7 @@ trace-events-subdirs += block
trace-events-subdirs += hw/block
trace-events-subdirs += hw/char
trace-events-subdirs += hw/intc
-trace-events-y += hw/net/trace-events
+trace-events-subdirs += hw/net
trace-events-y += hw/virtio/trace-events
trace-events-y += hw/audio/trace-events
trace-events-y += hw/misc/trace-events
@@ -43,3 +43,6 @@ common-obj-$(CONFIG_ROCKER) += rocker/rocker.o rocker/rocker_fp.o \
rocker/rocker_desc.o rocker/rocker_world.o \
rocker/rocker_of_dpa.o
obj-$(call lnot,$(CONFIG_ROCKER)) += rocker/qmp-norocker.o
+
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
@@ -46,7 +46,7 @@
#include "e1000x_common.h"
#include "e1000e_core.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#define TYPE_E1000E "e1000e"
#define E1000E(obj) OBJECT_CHECK(E1000EState, (obj), TYPE_E1000E)
@@ -46,7 +46,7 @@
#include "e1000x_common.h"
#include "e1000e_core.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#define E1000E_MIN_XITR (500) /* No more then 7813 interrupts per
second according to spec 10.2.4.2 */
@@ -29,7 +29,7 @@
#include "e1000x_common.h"
-#include "trace.h"
+#include "hw/net/trace.h"
bool e1000x_rx_ready(PCIDevice *d, uint32_t *mac)
{
@@ -42,7 +42,7 @@
#include "qemu/sockets.h"
#include "hw/sparc/sun4m.h"
#include "pcnet.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#include "sysemu/sysemu.h"
#define TYPE_LANCE "lance"
@@ -28,7 +28,7 @@
#include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */
#include "hw/hw.h"
#include "hw/sysbus.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#include "net/net.h"
#include "qemu/error-report.h"
@@ -1,7 +1,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "net/net.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#include "hw/sysbus.h"
/* MIPSnet register offsets */
@@ -16,7 +16,7 @@
*/
#include "qemu/osdep.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#include "net_rx_pkt.h"
#include "net/checksum.h"
#include "net/tap.h"
@@ -37,7 +37,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
-#include "trace.h"
+#include "hw/net/trace.h"
/* RECSMALL is not used because it breaks tap networking in linux:
* incoming ARP responses are too short
@@ -34,7 +34,7 @@
#include "qemu/timer.h"
#include "sysemu/dma.h"
#include "sysemu/sysemu.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#include "pcnet.h"
@@ -41,7 +41,7 @@
#include "qemu/timer.h"
#include "qemu/sockets.h"
#include "sysemu/sysemu.h"
-#include "trace.h"
+#include "hw/net/trace.h"
#include "pcnet.h"
Switch files in the hw/net/ directory to include the hw/net/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- Makefile.objs | 2 +- hw/net/Makefile.objs | 3 +++ hw/net/e1000e.c | 2 +- hw/net/e1000e_core.c | 2 +- hw/net/e1000x_common.c | 2 +- hw/net/lance.c | 2 +- hw/net/milkymist-minimac2.c | 2 +- hw/net/mipsnet.c | 2 +- hw/net/net_rx_pkt.c | 2 +- hw/net/opencores_eth.c | 2 +- hw/net/pcnet-pci.c | 2 +- hw/net/pcnet.c | 2 +- 12 files changed, 14 insertions(+), 11 deletions(-)