提交 55d5d048 编写于 作者: P Paolo Bonzini 提交者: Anthony Liguori

memory: add tracepoints for MMIO reads/writes

This is quite handy to debug softmmu targets.
Reviewed-by: NAndreas Faerber <afaerber@suse.de>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1375016242-32651-1-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 8cdd2e0a
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qom/object.h" #include "qom/object.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "trace.h"
#include <assert.h> #include <assert.h>
#include "exec/memory-internal.h" #include "exec/memory-internal.h"
...@@ -388,6 +389,7 @@ static void memory_region_oldmmio_read_accessor(MemoryRegion *mr, ...@@ -388,6 +389,7 @@ static void memory_region_oldmmio_read_accessor(MemoryRegion *mr,
uint64_t tmp; uint64_t tmp;
tmp = mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr); tmp = mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr);
trace_memory_region_ops_read(mr, addr, tmp, size);
*value |= (tmp & mask) << shift; *value |= (tmp & mask) << shift;
} }
...@@ -404,6 +406,7 @@ static void memory_region_read_accessor(MemoryRegion *mr, ...@@ -404,6 +406,7 @@ static void memory_region_read_accessor(MemoryRegion *mr,
qemu_flush_coalesced_mmio_buffer(); qemu_flush_coalesced_mmio_buffer();
} }
tmp = mr->ops->read(mr->opaque, addr, size); tmp = mr->ops->read(mr->opaque, addr, size);
trace_memory_region_ops_read(mr, addr, tmp, size);
*value |= (tmp & mask) << shift; *value |= (tmp & mask) << shift;
} }
...@@ -417,6 +420,7 @@ static void memory_region_oldmmio_write_accessor(MemoryRegion *mr, ...@@ -417,6 +420,7 @@ static void memory_region_oldmmio_write_accessor(MemoryRegion *mr,
uint64_t tmp; uint64_t tmp;
tmp = (*value >> shift) & mask; tmp = (*value >> shift) & mask;
trace_memory_region_ops_write(mr, addr, tmp, size);
mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, tmp); mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, tmp);
} }
...@@ -433,6 +437,7 @@ static void memory_region_write_accessor(MemoryRegion *mr, ...@@ -433,6 +437,7 @@ static void memory_region_write_accessor(MemoryRegion *mr,
qemu_flush_coalesced_mmio_buffer(); qemu_flush_coalesced_mmio_buffer();
} }
tmp = (*value >> shift) & mask; tmp = (*value >> shift) & mask;
trace_memory_region_ops_write(mr, addr, tmp, size);
mr->ops->write(mr->opaque, addr, tmp, size); mr->ops->write(mr->opaque, addr, tmp, size);
} }
......
...@@ -1165,6 +1165,10 @@ kvm_vm_ioctl(int type, void *arg) "type %d, arg %p" ...@@ -1165,6 +1165,10 @@ kvm_vm_ioctl(int type, void *arg) "type %d, arg %p"
kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type %d, arg %p" kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type %d, arg %p"
kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d" kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d"
# memory.c
memory_region_ops_read(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u"
memory_region_ops_write(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u"
# qom/object.c # qom/object.c
object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)" object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)"
object_class_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)" object_class_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册