plugins: remove qemu_plugin_id from qemu_plugin_vcpu_tb_trans_cb_t
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Link: https://lore.kernel.org/qemu-devel/20260615193526.2883349-16-pierrick.bouvier@oss.qualcomm.com Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Pierrick Bouvier committed
Jun 15, 2026 at 12:35 UTC
ab24e19b42ebd3f9789cdf3b268d61c0a87e2b7a
25 files changed
+26
-28
contrib/plugins/bbv.c
+1
-1
@@ -102,7 +102,7 @@ static void vcpu_interval_exec(unsigned int vcpu_index, void *udata)
102
fputc('\n', vcpu->file);
103
}
104
105
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
105
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
106
{
107
uint64_t n_insns = qemu_plugin_tb_n_insns(tb);
108
uint64_t vaddr = qemu_plugin_tb_vaddr(tb);
contrib/plugins/cache.c
+1
-1
@@ -462,7 +462,7 @@ static void vcpu_insn_exec(unsigned int vcpu_index, void *userdata)
462
g_mutex_unlock(&l2_ucache_locks[cache_idx]);
463
}
464
465
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
465
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
466
{
467
size_t n_insns;
468
size_t i;
contrib/plugins/cflow.c
+1
-1
@@ -297,7 +297,7 @@ static void vcpu_tb_branched_exec(unsigned int cpu_index, void *udata)
297
* instructions for their execution.
298
*
299
*/
300
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
300
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
301
{
302
uint64_t pc = qemu_plugin_tb_vaddr(tb);
303
size_t insns = qemu_plugin_tb_n_insns(tb);
contrib/plugins/cpp.cpp
+1
-1
@@ -363,7 +363,7 @@
363
364
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
365
366
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
366
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
367
{
368
}
369
contrib/plugins/drcov.c
+1
-1
@@ -119,7 +119,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
119
g_mutex_unlock(&lock);
120
}
121
122
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
122
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
123
{
124
uint64_t pc = qemu_plugin_tb_vaddr(tb);
125
size_t n = qemu_plugin_tb_n_insns(tb);
contrib/plugins/execlog.c
+1
-1
@@ -177,7 +177,7 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata)
177
* QEMU convert code by translation block (TB). By hooking here we can then hook
178
* a callback on each instruction and memory access.
179
*/
180
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
180
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
181
{
182
struct qemu_plugin_insn *insn;
183
bool skip = (imatches || amatches);
contrib/plugins/hotblocks.c
+1
-1
@@ -121,7 +121,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
121
* Otherwise a helper is inserted which calls the vcpu_tb_exec
122
* callback.
123
*/
124
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
124
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
125
{
126
ExecCount *cnt;
127
uint64_t pc = qemu_plugin_tb_vaddr(tb);
contrib/plugins/hotpages.c
+1
-1
@@ -148,7 +148,7 @@ static void vcpu_haddr(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
148
g_mutex_unlock(&lock);
149
}
150
151
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
151
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
152
{
153
size_t n = qemu_plugin_tb_n_insns(tb);
154
size_t i;
contrib/plugins/howvec.c
+1
-1
@@ -310,7 +310,7 @@ static struct qemu_plugin_scoreboard *find_counter(
310
return NULL;
311
}
312
313
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
313
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
314
{
315
size_t n = qemu_plugin_tb_n_insns(tb);
316
size_t i;
contrib/plugins/hwprofile.c
+1
-1
@@ -242,7 +242,7 @@ static void vcpu_haddr(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
242
}
243
}
244
245
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
245
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
246
{
247
size_t n = qemu_plugin_tb_n_insns(tb);
248
size_t i;
contrib/plugins/ips.c
+1
-1
@@ -110,7 +110,7 @@ static void every_quantum_insn(unsigned int cpu_index, void *udata)
110
update_system_time(vcpu);
111
}
112
113
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
113
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
114
{
115
size_t n_insns = qemu_plugin_tb_n_insns(tb);
116
qemu_plugin_u64 quantum_insn =
contrib/plugins/lockstep.c
+1
-1
@@ -249,7 +249,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
249
log = g_slist_prepend(log, exec);
250
}
251
252
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
252
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
253
{
254
BlockInfo *bi = g_new0(BlockInfo, 1);
255
bi->pc = qemu_plugin_tb_vaddr(tb);
contrib/plugins/stoptrigger.c
+1
-1
@@ -64,7 +64,7 @@ static void exit_address_reached(unsigned int cpu_index, void *udata)
64
exit_emulation(ei->exit_code, msg);
65
}
66
67
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
67
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
68
{
69
size_t tb_n = qemu_plugin_tb_n_insns(tb);
70
for (size_t i = 0; i < tb_n; i++) {
contrib/plugins/uftrace.c
+1
-1
@@ -838,7 +838,7 @@ static void track_callstack(unsigned int cpu_index, void *udata)
838
trace_enter_stack(t, cs, timestamp);
839
}
840
841
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
841
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
842
{
843
size_t n_insns = qemu_plugin_tb_n_insns(tb);
844
uintptr_t tb_pc = qemu_plugin_tb_vaddr(tb);
include/plugins/qemu-plugin.h
+1
-3
@@ -417,11 +417,9 @@ enum qemu_plugin_cond {
417
418
/**
419
* typedef qemu_plugin_vcpu_tb_trans_cb_t - translation callback
420
- * @id: unique plugin id
420
* @tb: opaque handle used for querying and instrumenting a block.
421
*/
423
-typedef void (*qemu_plugin_vcpu_tb_trans_cb_t)(qemu_plugin_id_t id,
424
- struct qemu_plugin_tb *tb);
422
+typedef void (*qemu_plugin_vcpu_tb_trans_cb_t)(struct qemu_plugin_tb *tb);
423
424
/**
425
* qemu_plugin_register_vcpu_tb_trans_cb() - register a translate cb
plugins/core.c
+1
-1
@@ -488,7 +488,7 @@ void qemu_plugin_tb_trans_cb(CPUState *cpu, struct qemu_plugin_tb *tb)
488
qemu_plugin_vcpu_tb_trans_cb_t func = cb->f.vcpu_tb_trans;
489
490
qemu_plugin_set_cb_flags(cpu, QEMU_PLUGIN_CB_RW_REGS);
491
- func(cb->ctx->id, tb);
491
+ func(tb);
492
qemu_plugin_set_cb_flags(cpu, QEMU_PLUGIN_CB_NO_REGS);
493
}
494
}
tests/tcg/plugins/bb.c
+1
-1
@@ -77,7 +77,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
77
count->bb_count++;
78
}
79
80
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
80
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
81
{
82
size_t n_insns = qemu_plugin_tb_n_insns(tb);
83
tests/tcg/plugins/discons.c
+1
-1
@@ -147,7 +147,7 @@ static void insn_exec(unsigned int vcpu_index, void *userdata)
147
}
148
}
149
150
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
150
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
151
{
152
size_t n_insns = qemu_plugin_tb_n_insns(tb);
153
for (size_t i = 0; i < n_insns; i++) {
tests/tcg/plugins/empty.c
+1
-1
@@ -20,7 +20,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
20
* This allows us to measure the overhead of injecting and then
21
* removing empty instrumentation.
22
*/
23
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
23
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
24
{ }
25
26
QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
tests/tcg/plugins/inline.c
+1
-1
@@ -223,7 +223,7 @@ static void vcpu_mem_access(unsigned int cpu_index,
223
g_mutex_unlock(&mem_lock);
224
}
225
226
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
226
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
227
{
228
void *tb_store = tb;
229
qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu(
tests/tcg/plugins/insn.c
+1
-1
@@ -138,7 +138,7 @@ static void vcpu_insn_matched_exec_before(unsigned int cpu_index, void *udata)
138
}
139
}
140
141
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
141
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
142
{
143
size_t n = qemu_plugin_tb_n_insns(tb);
144
size_t i;
tests/tcg/plugins/mem.c
+1
-1
@@ -266,7 +266,7 @@ static void print_access(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
266
qemu_plugin_outs(out->str);
267
}
268
269
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
269
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
270
{
271
size_t n = qemu_plugin_tb_n_insns(tb);
272
size_t i;
tests/tcg/plugins/patch.c
+1
-1
@@ -130,7 +130,7 @@ static void patch_vaddr(unsigned int vcpu_index, void *userdata)
130
/*
131
* Callback on translation of a translation block.
132
*/
133
-static void vcpu_tb_trans_cb(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
133
+static void vcpu_tb_trans_cb(struct qemu_plugin_tb *tb)
134
{
135
g_autoptr(GByteArray) insn_data = g_byte_array_new();
136
uintptr_t addr = 0;
tests/tcg/plugins/reset.c
+2
-2
@@ -27,7 +27,7 @@ static void tb_exec_after_reset(unsigned int vcpu_index, void *userdata)
27
qemu_plugin_uninstall(plugin_id, after_uninstall, NULL);
28
}
29
30
-static void tb_trans_after_reset(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
30
+static void tb_trans_after_reset(struct qemu_plugin_tb *tb)
31
{
32
g_assert(was_reset && !was_uninstalled);
33
qemu_plugin_register_vcpu_tb_exec_cb(tb, tb_exec_after_reset,
@@ -49,7 +49,7 @@ static void tb_exec_before_reset(unsigned int vcpu_index, void *userdata)
49
qemu_plugin_reset(plugin_id, after_reset, (void *) plugin_id);
50
}
51
52
-static void tb_trans_before_reset(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
52
+static void tb_trans_before_reset(struct qemu_plugin_tb *tb)
53
{
54
g_assert(!was_reset && !was_uninstalled);
55
qemu_plugin_register_vcpu_tb_exec_cb(tb, tb_exec_before_reset,
tests/tcg/plugins/setpc.c
+1
-1
@@ -73,7 +73,7 @@ static void vcpu_mem_access(unsigned int vcpu_index,
73
}
74
}
75
76
-static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
76
+static void vcpu_tb_trans(struct qemu_plugin_tb *tb)
77
{
78
size_t insns = qemu_plugin_tb_n_insns(tb);
79
for (size_t i = 0; i < insns; i++) {