From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91g-0006iP-QK for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91d-0005nz-HA for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91d-0005nt-9S for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:05 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0E38BAF3 for ; Tue, 9 Aug 2016 15:33:04 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:54 +0100 Message-Id: <1470756748-18933-27-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 26/60] trace: switch hw/net/ directory to modular trace.h file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" 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 --- 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(-) diff --git a/Makefile.objs b/Makefile.objs index b1306fa..049be9c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -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 diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index 610ed3e..da244c2 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -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 diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index d001c96..51591e8 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -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) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index badb1fe..6bfd692 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -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 */ diff --git a/hw/net/e1000x_common.c b/hw/net/e1000x_common.c index eb0e097..7b6cfa8 100644 --- a/hw/net/e1000x_common.c +++ b/hw/net/e1000x_common.c @@ -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) { diff --git a/hw/net/lance.c b/hw/net/lance.c index 573d724..6e36f9f 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -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" diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index c3a12e1..0a0d43f 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -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" diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index 5a63df7..5f8fd6a 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -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 */ diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index 1019b50..9ec6e61 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -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" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 268d6a7..2a38c05 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -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 diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 0acf8a4..6cfc121 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -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" diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 198a01f..4e19d4e 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -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" -- 2.7.4