From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL v2 11/14] accel/tcg: Remove trace events from trace-root.h
Date: Tue, 20 Dec 2022 21:03:10 -0800 [thread overview]
Message-ID: <20221221050313.2950701-12-richard.henderson@linaro.org> (raw)
In-Reply-To: <20221221050313.2950701-1-richard.henderson@linaro.org>
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
next prev parent reply other threads:[~2022-12-21 5:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 5:02 [PULL v2 00/14] accel/tcg: Rewrite user-only vma tracking Richard Henderson
2022-12-21 5:03 ` [PULL v2 01/14] util: Add interval-tree.c Richard Henderson
2022-12-21 5:03 ` [PULL v2 02/14] accel/tcg: Rename page_flush_tb Richard Henderson
2022-12-21 5:03 ` [PULL v2 03/14] accel/tcg: Use interval tree for TBs in user-only mode Richard Henderson
2022-12-21 5:03 ` [PULL v2 04/14] accel/tcg: Use interval tree for TARGET_PAGE_DATA_SIZE Richard Henderson
2022-12-21 5:03 ` [PULL v2 05/14] accel/tcg: Drop PAGE_RESERVED for CONFIG_BSD Richard Henderson
2022-12-21 5:03 ` [PULL v2 06/14] accel/tcg: Move page_{get,set}_flags to user-exec.c Richard Henderson
2022-12-21 5:03 ` [PULL v2 07/14] accel/tcg: Use interval tree for user-only page tracking Richard Henderson
2022-12-23 14:32 ` Ilya Leoshkevich
2022-12-24 14:45 ` Richard Henderson
2022-12-21 5:03 ` [PULL v2 08/14] accel/tcg: Move PageDesc tree into tb-maint.c for system Richard Henderson
2022-12-21 5:03 ` [PULL v2 09/14] accel/tcg: Move remainder of page locking to tb-maint.c Richard Henderson
2022-12-21 5:03 ` [PULL v2 10/14] accel/tcg: Restrict cpu_io_recompile() to system emulation Richard Henderson
2022-12-21 5:03 ` Richard Henderson [this message]
2022-12-21 5:03 ` [PULL v2 12/14] accel/tcg: Rename tb_invalidate_phys_page_fast{, __locked}() Richard Henderson
2022-12-21 5:03 ` [PULL v2 13/14] accel/tcg: Factor tb_invalidate_phys_range_fast() out Richard Henderson
2022-12-21 5:03 ` [PULL v2 14/14] accel/tcg: Restrict page_collection structure to system TB maintainance Richard Henderson
2022-12-21 15:43 ` [PULL v2 00/14] accel/tcg: Rewrite user-only vma tracking Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221221050313.2950701-12-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).