plugins: remove qemu_plugin_id_t from qemu_plugin_vcpu_simple_cb_t
Not used in all our plugins. Future commits will remove qemu_plugin_vcpu_simple_cb_t completely, and replace it with qemu_plugin_vcpu_udata_cb_t, so id information can be passed using userdata if needed. Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Link: https://lore.kernel.org/qemu-devel/20260615193526.2883349-7-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
6be156bd4d2344fa4497edb73b2ae56af104af46
9 files changed
+11
-15
contrib/plugins/bbv.c
+1
-1
@@ -60,7 +60,7 @@ static qemu_plugin_u64 bb_count_u64(Bb *bb)
60
return qemu_plugin_scoreboard_u64(bb->count);
61
}
62
63
-static void vcpu_init(qemu_plugin_id_t id, unsigned int vcpu_index)
63
+static void vcpu_init(unsigned int vcpu_index)
64
{
65
g_autofree gchar *vcpu_filename = NULL;
66
Vcpu *vcpu = qemu_plugin_scoreboard_find(vcpus, vcpu_index);
contrib/plugins/execlog.c
+1
-1
@@ -382,7 +382,7 @@ static GPtrArray *registers_init(int vcpu_index)
382
* As we could have multiple threads trying to do this we need to
383
* serialise the expansion under a lock.
384
*/
385
-static void vcpu_init(qemu_plugin_id_t id, unsigned int vcpu_index)
385
+static void vcpu_init(unsigned int vcpu_index)
386
{
387
CPU *c;
388
contrib/plugins/ips.c
+2
-2
@@ -89,7 +89,7 @@ static void update_system_time(vCPUTime *vcpu)
89
g_mutex_unlock(&global_state_lock);
90
}
91
92
-static void vcpu_init(qemu_plugin_id_t id, unsigned int cpu_index)
92
+static void vcpu_init(unsigned int cpu_index)
93
{
94
vCPUTime *vcpu = qemu_plugin_scoreboard_find(vcpus, cpu_index);
95
vcpu->total_insn = 0;
@@ -97,7 +97,7 @@ static void vcpu_init(qemu_plugin_id_t id, unsigned int cpu_index)
97
vcpu->last_quantum_time = now_ns();
98
}
99
100
-static void vcpu_exit(qemu_plugin_id_t id, unsigned int cpu_index)
100
+static void vcpu_exit(unsigned int cpu_index)
101
{
102
vCPUTime *vcpu = qemu_plugin_scoreboard_find(vcpus, cpu_index);
103
update_system_time(vcpu);
contrib/plugins/uftrace.c
+1
-1
@@ -874,7 +874,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
874
}
875
}
876
877
-static void vcpu_init(qemu_plugin_id_t id, unsigned int vcpu_index)
877
+static void vcpu_init(unsigned int vcpu_index)
878
{
879
Cpu *cpu = qemu_plugin_scoreboard_find(score, vcpu_index);
880
cpu->ops = arch_ops;
include/plugins/qemu-plugin.h
+1
-3
@@ -149,11 +149,9 @@ typedef void (*qemu_plugin_udata_cb_t)(void *userdata);
149
150
/**
151
* typedef qemu_plugin_vcpu_simple_cb_t - vcpu callback
152
- * @id: the unique qemu_plugin_id_t
152
* @vcpu_index: the current vcpu context
153
*/
155
-typedef void (*qemu_plugin_vcpu_simple_cb_t)(qemu_plugin_id_t id,
156
- unsigned int vcpu_index);
154
+typedef void (*qemu_plugin_vcpu_simple_cb_t)(unsigned int vcpu_index);
155
156
/**
157
* typedef qemu_plugin_vcpu_udata_cb_t - vcpu callback
plugins/core.c
+2
-4
@@ -96,8 +96,7 @@ static void plugin_vcpu_cb__simple(CPUState *cpu, enum qemu_plugin_event ev)
96
/* iterate safely; plugins might uninstall themselves at any time */
97
QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) {
98
qemu_plugin_vcpu_simple_cb_t func = cb->f.vcpu_simple;
99
-
100
- func(cb->ctx->id, cpu->cpu_index);
99
+ func(cpu->cpu_index);
100
}
101
break;
102
default:
@@ -306,8 +305,7 @@ static void plugin_vcpu_for_each(gpointer k, gpointer v, gpointer udata)
305
{
306
struct plugin_for_each_args *args = udata;
307
int cpu_index = *(int *)k;
309
-
310
- args->cb(args->ctx->id, cpu_index);
308
+ args->cb(cpu_index);
309
}
310
311
void qemu_plugin_vcpu_for_each(qemu_plugin_id_t id,
tests/tcg/plugins/bb.c
+1
-1
@@ -56,7 +56,7 @@ static void plugin_exit(void *p)
56
qemu_plugin_scoreboard_free(counts);
57
}
58
59
-static void vcpu_idle(qemu_plugin_id_t id, unsigned int cpu_index)
59
+static void vcpu_idle(unsigned int cpu_index)
60
{
61
CPUCount *count = qemu_plugin_scoreboard_find(counts, cpu_index);
62
g_autoptr(GString) report = g_string_new("");
tests/tcg/plugins/insn.c
+1
-1
@@ -84,7 +84,7 @@ static Instruction * get_insn_record(const char *disas, uint64_t vaddr, Match *m
84
/*
85
* Initialise a new vcpu with reading the register list
86
*/
87
-static void vcpu_init(qemu_plugin_id_t id, unsigned int vcpu_index)
87
+static void vcpu_init(unsigned int vcpu_index)
88
{
89
g_autoptr(GArray) reg_list = qemu_plugin_get_registers();
90
g_autoptr(GByteArray) reg_value = g_byte_array_new();
tests/tcg/plugins/registers.c
+1
-1
@@ -21,7 +21,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
21
* registers that cannot be written to, which would fail the test.
22
* See: https://lists.gnu.org/archive/html/qemu-devel/2026-02/msg07025.html
23
*/
24
-static void vcpu_init_cb(qemu_plugin_id_t id, unsigned int vcpu_index)
24
+static void vcpu_init_cb(unsigned int vcpu_index)
25
{
26
g_autoptr(GArray) regs = qemu_plugin_get_registers();
27
g_assert(regs != NULL);