From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0JJn-0000bf-20 for qemu-devel@nongnu.org; Sun, 04 Sep 2011 16:29:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0JJi-0001bg-3R for qemu-devel@nongnu.org; Sun, 04 Sep 2011 16:29:26 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:56237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0JJh-0001bI-FQ for qemu-devel@nongnu.org; Sun, 04 Sep 2011 16:29:22 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 4 Sep 2011 22:29:27 +0200 Message-Id: <1315168167-10654-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1315168167-10654-1-git-send-email-hpoussin@reactos.org> References: <1315168167-10654-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/2] mipsnet: use trace framework List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/mipsnet.c | 26 ++++++-------------------- trace-events | 7 +++++++ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/hw/mipsnet.c b/hw/mipsnet.c index 9a29ffe..605367b 100644 --- a/hw/mipsnet.c +++ b/hw/mipsnet.c @@ -1,12 +1,8 @@ #include "hw.h" #include "net.h" +#include "trace.h" #include "sysbus.h" =20 -//#define DEBUG_MIPSNET_SEND -//#define DEBUG_MIPSNET_RECEIVE -//#define DEBUG_MIPSNET_DATA -//#define DEBUG_MIPSNET_IRQ - /* MIPSnet register offsets */ =20 #define MIPSNET_DEV_ID 0x00 @@ -55,9 +51,7 @@ static void mipsnet_reset(MIPSnetState *s) static void mipsnet_update_irq(MIPSnetState *s) { int isr =3D !!s->intctl; -#ifdef DEBUG_MIPSNET_IRQ - printf("mipsnet: Set IRQ to %d (%02x)\n", isr, s->intctl); -#endif + trace_mipsnet_irq(isr, s->intctl); qemu_set_irq(s->irq, isr); } =20 @@ -81,9 +75,7 @@ static ssize_t mipsnet_receive(VLANClientState *nc, con= st uint8_t *buf, size_t s { MIPSnetState *s =3D DO_UPCAST(NICState, nc, nc)->opaque; =20 -#ifdef DEBUG_MIPSNET_RECEIVE - printf("mipsnet: receiving len=3D%zu\n", size); -#endif + trace_mipsnet_receive(size); if (!mipsnet_can_receive(nc)) return -1; =20 @@ -146,9 +138,7 @@ static uint64_t mipsnet_ioport_read(void *opaque, tar= get_phys_addr_t addr, default: break; } -#ifdef DEBUG_MIPSNET_DATA - printf("mipsnet: read addr=3D0x%02x val=3D0x%02x\n", addr, ret); -#endif + trace_mipsnet_read(addr, ret); return ret; } =20 @@ -158,9 +148,7 @@ static void mipsnet_ioport_write(void *opaque, target= _phys_addr_t addr, MIPSnetState *s =3D opaque; =20 addr &=3D 0x3f; -#ifdef DEBUG_MIPSNET_DATA - printf("mipsnet: write addr=3D0x%02x val=3D0x%02x\n", addr, val); -#endif + trace_mipsnet_write(addr, val); switch (addr) { case MIPSNET_TX_DATA_COUNT: s->tx_count =3D (val <=3D MAX_ETH_FRAME_SIZE) ? val : 0; @@ -184,9 +172,7 @@ static void mipsnet_ioport_write(void *opaque, target= _phys_addr_t addr, s->tx_buffer[s->tx_written++] =3D val; if (s->tx_written =3D=3D s->tx_count) { /* Send buffer. */ -#ifdef DEBUG_MIPSNET_SEND - printf("mipsnet: sending len=3D%d\n", s->tx_count); -#endif + trace_mipsnet_send(s->tx_count); qemu_send_packet(&s->nic->nc, s->tx_buffer, s->tx_count); s->tx_count =3D s->tx_written =3D 0; s->intctl |=3D MIPSNET_INTCTL_TXDONE; diff --git a/trace-events b/trace-events index 2fd56f1..a303199 100644 --- a/trace-events +++ b/trace-events @@ -422,6 +422,13 @@ milkymist_uart_pulse_irq_tx(void) "Pulse IRQ TX" milkymist_vgafb_memory_read(uint32_t addr, uint32_t value) "addr %08x va= lue %08x" milkymist_vgafb_memory_write(uint32_t addr, uint32_t value) "addr %08x v= alue %08x" =20 +# hw/mipsnet.c +mipsnet_send(uint32_t size) "sending len=3D%u" +mipsnet_receive(uint32_t size) "receiving len=3D%u" +mipsnet_read(uint64_t addr, uint32_t val) "read addr=3D0x%" PRIx64 " val= =3D0x%x" +mipsnet_write(uint64_t addr, uint64_t val) "write addr=3D0x%" PRIx64 " v= al=3D0x%" PRIx64 +mipsnet_irq(uint32_t isr, uint32_t intctl) "set irq to %d (%02x)" + # xen-all.c xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#= lx, size %#lx" xen_client_set_memory(uint64_t start_addr, unsigned long size, unsigned = long phys_offset, bool log_dirty) "%#"PRIx64" size %#lx, offset %#lx, log= _dirty %i" --=20 1.7.5.4