mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/net/ne2000: Add trace events

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-06-21 14:12:53 -03:00 committed by Stefan Hajnoczi
parent 349632a29d
commit cd4479a91a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/net/ne2000.c
View File

@ -26,6 +26,7 @@
#include "net/eth.h" #include "net/eth.h"
#include "ne2000.h" #include "ne2000.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "trace.h"
/* debug NE2000 card */ /* debug NE2000 card */
//#define DEBUG_NE2000 //#define DEBUG_NE2000
@ -662,19 +663,24 @@ static uint64_t ne2000_read(void *opaque, hwaddr addr,
unsigned size) unsigned size)
{ {
NE2000State *s = opaque; NE2000State *s = opaque;
uint64_t val;
if (addr < 0x10 && size == 1) { if (addr < 0x10 && size == 1) {
return ne2000_ioport_read(s, addr); val = ne2000_ioport_read(s, addr);
} else if (addr == 0x10) { } else if (addr == 0x10) {
if (size <= 2) { if (size <= 2) {
return ne2000_asic_ioport_read(s, addr); val = ne2000_asic_ioport_read(s, addr);
} else { } else {
return ne2000_asic_ioport_readl(s, addr); val = ne2000_asic_ioport_readl(s, addr);
} }
} else if (addr == 0x1f && size == 1) { } else if (addr == 0x1f && size == 1) {
return ne2000_reset_ioport_read(s, addr); val = ne2000_reset_ioport_read(s, addr);
} else {
val = ((uint64_t)1 << (size * 8)) - 1;
} }
return ((uint64_t)1 << (size * 8)) - 1; trace_ne2000_read(addr, val);
return val;
} }
static void ne2000_write(void *opaque, hwaddr addr, static void ne2000_write(void *opaque, hwaddr addr,
@ -682,6 +688,7 @@ static void ne2000_write(void *opaque, hwaddr addr,
{ {
NE2000State *s = opaque; NE2000State *s = opaque;
trace_ne2000_write(addr, data);
if (addr < 0x10 && size == 1) { if (addr < 0x10 && size == 1) {
ne2000_ioport_write(s, addr, data); ne2000_ioport_write(s, addr, data);
} else if (addr == 0x10) { } else if (addr == 0x10) {

4
hw/net/trace-events
View File

@ -23,6 +23,10 @@ mipsnet_read(uint64_t addr, uint32_t val) "read addr=0x%" PRIx64 " val=0x%x"
mipsnet_write(uint64_t addr, uint64_t val) "write addr=0x%" PRIx64 " val=0x%" PRIx64 mipsnet_write(uint64_t addr, uint64_t val) "write addr=0x%" PRIx64 " val=0x%" PRIx64
mipsnet_irq(uint32_t isr, uint32_t intctl) "set irq to %d (0x%02x)" mipsnet_irq(uint32_t isr, uint32_t intctl) "set irq to %d (0x%02x)"
# hw/net/ne2000.c
ne2000_read(uint64_t addr, uint64_t val) "read addr=0x%" PRIx64 " val=0x%" PRIx64
ne2000_write(uint64_t addr, uint64_t val) "write addr=0x%" PRIx64 " val=0x%" PRIx64
# hw/net/opencores_eth.c # hw/net/opencores_eth.c
open_eth_mii_write(unsigned idx, uint16_t v) "MII[0x%02x] <- 0x%04x" open_eth_mii_write(unsigned idx, uint16_t v) "MII[0x%02x] <- 0x%04x"
open_eth_mii_read(unsigned idx, uint16_t v) "MII[0x%02x] -> 0x%04x" open_eth_mii_read(unsigned idx, uint16_t v) "MII[0x%02x] -> 0x%04x"