[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/13] accel/tcg: Remove trace events from trace-root.h
From: |
Richard Henderson |
Subject: |
[PULL 10/13] accel/tcg: Remove trace events from trace-root.h |
Date: |
Fri, 16 Dec 2022 10:53:02 -0800 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Commit d9bb58e510 ("tcg: move tcg related files into accel/tcg/
subdirectory") introduced accel/tcg/trace-events, so we don't
need to use the root trace-events anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221209093649.43738-3-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/cputlb.c | 2 +-
accel/tcg/trace-events | 4 ++++
trace-events | 4 ----
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 6f1c00682b..ac459478f4 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -33,7 +33,7 @@
#include "qemu/atomic.h"
#include "qemu/atomic128.h"
#include "exec/translate-all.h"
-#include "trace/trace-root.h"
+#include "trace.h"
#include "tb-hash.h"
#include "internal.h"
#ifdef CONFIG_PLUGIN
diff --git a/accel/tcg/trace-events b/accel/tcg/trace-events
index 59eab96f26..4e9b450520 100644
--- a/accel/tcg/trace-events
+++ b/accel/tcg/trace-events
@@ -6,5 +6,9 @@ exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR
exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR
exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=0x%x"
+# cputlb.c
+memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned size)
"0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u"
+memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64
+
# translate-all.c
translate_block(void *tb, uintptr_t pc, const void *tb_code) "tb:%p,
pc:0x%"PRIxPTR", tb_code:%p"
diff --git a/trace-events b/trace-events
index 035f3d570d..b6b84b175e 100644
--- a/trace-events
+++ b/trace-events
@@ -42,10 +42,6 @@ find_ram_offset(uint64_t size, uint64_t offset) "size: 0x%"
PRIx64 " @ 0x%" PRIx
find_ram_offset_loop(uint64_t size, uint64_t candidate, uint64_t offset,
uint64_t next, uint64_t mingap) "trying size: 0x%" PRIx64 " @ 0x%" PRIx64 ",
offset: 0x%" PRIx64" next: 0x%" PRIx64 " mingap: 0x%" PRIx64
ram_block_discard_range(const char *rbname, void *hva, size_t length, bool
need_madvise, bool need_fallocate, int ret) "%s@%p + 0x%zx: madvise: %d
fallocate: %d ret: %d"
-# accel/tcg/cputlb.c
-memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned size)
"0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u"
-memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64
-
# job.c
job_state_transition(void *job, int ret, const char *legal, const char *s0,
const char *s1) "job %p (ret: %d) attempting %s transition (%s-->%s)"
job_apply_verb(void *job, const char *state, const char *verb, const char
*legal) "job %p in state %s; applying verb %s (%s)"
--
2.34.1
- [PULL 00/13] accel/tcg: Rewrite user-only vma tracking, Richard Henderson, 2022/12/16
- [PULL 01/13] util: Add interval-tree.c, Richard Henderson, 2022/12/16
- [PULL 04/13] accel/tcg: Use interval tree for TARGET_PAGE_DATA_SIZE, Richard Henderson, 2022/12/16
- [PULL 02/13] accel/tcg: Rename page_flush_tb, Richard Henderson, 2022/12/16
- [PULL 03/13] accel/tcg: Use interval tree for TBs in user-only mode, Richard Henderson, 2022/12/16
- [PULL 05/13] accel/tcg: Move page_{get,set}_flags to user-exec.c, Richard Henderson, 2022/12/16
- [PULL 07/13] accel/tcg: Move PageDesc tree into tb-maint.c for system, Richard Henderson, 2022/12/16
- [PULL 06/13] accel/tcg: Use interval tree for user-only page tracking, Richard Henderson, 2022/12/16
- [PULL 10/13] accel/tcg: Remove trace events from trace-root.h,
Richard Henderson <=
- [PULL 09/13] accel/tcg: Restrict cpu_io_recompile() to system emulation, Richard Henderson, 2022/12/16
- [PULL 08/13] accel/tcg: Move remainder of page locking to tb-maint.c, Richard Henderson, 2022/12/16
- [PULL 11/13] accel/tcg: Rename tb_invalidate_phys_page_fast{, __locked}(), Richard Henderson, 2022/12/16
- [PULL 12/13] accel/tcg: Factor tb_invalidate_phys_range_fast() out, Richard Henderson, 2022/12/16
- [PULL 13/13] accel/tcg: Restrict page_collection structure to system TB maintainance, Richard Henderson, 2022/12/16
- Re: [PULL 00/13] accel/tcg: Rewrite user-only vma tracking, Peter Maydell, 2022/12/17