summary refs log tree commit diff stats
path: root/hw/net
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-07-22 10:13:15 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-22 10:13:15 -0500
commit90c66f587c8d020a642d3c9376f9102c16f2234e (patch)
tree11d5a84b7472a3599b38b880b30c9fb1ad65cf8f /hw/net
parent24943978cbe79634a9a8b02a20efb25b29b3ab49 (diff)
parent3ba00637d024b9d43b26106060a23a85411d0757 (diff)
downloadfocaccia-qemu-90c66f587c8d020a642d3c9376f9102c16f2234e.tar.gz
focaccia-qemu-90c66f587c8d020a642d3c9376f9102c16f2234e.zip
Merge remote-tracking branch 'stefanha/tracing' into staging
# By Markus Armbruster
# Via Stefan Hajnoczi
* stefanha/tracing:
  trace-events: Fix up source file comments
  trace-events: Drop unused events
  milkymist-minimac2: Fix minimac2_read/_write tracepoints
  slavio_misc: Fix slavio_led_mem_readw/_writew tracepoints
  cleanup-trace-events.pl: New

Message-id: 1374119369-26496-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/net')
-rw-r--r--hw/net/milkymist-minimac2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index 2ef4ac3299..becd26c5d5 100644
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -355,7 +355,7 @@ minimac2_write(void *opaque, hwaddr addr, uint64_t value,
 {
     MilkymistMinimac2State *s = opaque;
 
-    trace_milkymist_minimac2_memory_read(addr, value);
+    trace_milkymist_minimac2_memory_write(addr, value);
 
     addr >>= 2;
     switch (addr) {