diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-22 10:13:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-22 10:13:15 -0500 |
| commit | 90c66f587c8d020a642d3c9376f9102c16f2234e (patch) | |
| tree | 11d5a84b7472a3599b38b880b30c9fb1ad65cf8f /hw | |
| parent | 24943978cbe79634a9a8b02a20efb25b29b3ab49 (diff) | |
| parent | 3ba00637d024b9d43b26106060a23a85411d0757 (diff) | |
| download | qemu-90c66f587c8d020a642d3c9376f9102c16f2234e.zip qemu-90c66f587c8d020a642d3c9376f9102c16f2234e.tar.gz qemu-90c66f587c8d020a642d3c9376f9102c16f2234e.tar.bz2 | |
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')
| -rw-r--r-- | hw/misc/slavio_misc.c | 2 | ||||
| -rw-r--r-- | hw/net/milkymist-minimac2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index d274fb4..00d9542 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -368,7 +368,7 @@ static void slavio_led_mem_writew(void *opaque, hwaddr addr, { MiscState *s = opaque; - trace_slavio_led_mem_readw(val & 0xffff); + trace_slavio_led_mem_writew(val & 0xffff); switch (addr) { case 0: s->leds = val; diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index 2ef4ac3..becd26c 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) { |