[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/5] memory.c: Use trace_event_get_state_backends()
From: |
Stefan Hajnoczi |
Subject: |
[PULL 3/5] memory.c: Use trace_event_get_state_backends() |
Date: |
Thu, 30 Jan 2020 21:38:12 +0000 |
From: Peter Maydell <address@hidden>
The preferred way to test whether a trace event is enabled is to
use trace_event_get_state_backends(), because this will give the
correct answer (allowing expensive computations to be skipped)
whether the trace event is compile-time or run-time disabled.
Convert the four old-style direct uses of TRACE_FOO_ENABLED in
memory.c.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
memory.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/memory.c b/memory.c
index 854798791e..aeaa8dcc9e 100644
--- a/memory.c
+++ b/memory.c
@@ -434,7 +434,7 @@ static MemTxResult
memory_region_read_accessor(MemoryRegion *mr,
tmp = mr->ops->read(mr->opaque, addr, size);
if (mr->subpage) {
trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);
- } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) {
+ } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_READ)) {
hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);
trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, size);
}
@@ -456,7 +456,7 @@ static MemTxResult
memory_region_read_with_attrs_accessor(MemoryRegion *mr,
r = mr->ops->read_with_attrs(mr->opaque, addr, &tmp, size, attrs);
if (mr->subpage) {
trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);
- } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) {
+ } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_READ)) {
hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);
trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, size);
}
@@ -476,7 +476,7 @@ static MemTxResult
memory_region_write_accessor(MemoryRegion *mr,
if (mr->subpage) {
trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp,
size);
- } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) {
+ } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_WRITE)) {
hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);
trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp,
size);
}
@@ -496,7 +496,7 @@ static MemTxResult
memory_region_write_with_attrs_accessor(MemoryRegion *mr,
if (mr->subpage) {
trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp,
size);
- } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) {
+ } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_WRITE)) {
hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);
trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp,
size);
}
--
2.24.1
- [PULL 0/5] Tracing patches, Stefan Hajnoczi, 2020/01/30
- [PULL 1/5] Makefile: Keep trace-events-subdirs ordered, Stefan Hajnoczi, 2020/01/30
- [PULL 2/5] docs/devel/tracing.txt: Recommend only trace_event_get_state_backends(), Stefan Hajnoczi, 2020/01/30
- [PULL 4/5] hw/display/qxl.c: Use trace_event_get_state_backends(), Stefan Hajnoczi, 2020/01/30
- [PULL 3/5] memory.c: Use trace_event_get_state_backends(),
Stefan Hajnoczi <=
- [PULL 5/5] qemu_set_log_filename: filename argument may be NULL, Stefan Hajnoczi, 2020/01/30
- Re: [PULL 0/5] Tracing patches, Peter Maydell, 2020/01/31
- Re: [PULL 0/5] Tracing patches, Peter Maydell, 2020/01/31