plugins: remove qemu_plugin_id from qemu_plugin_vcpu_discon_cb_t
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Link: https://lore.kernel.org/qemu-devel/20260615193526.2883349-15-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
65f399bce2166a388b81a6fe1111c2e7d6a4e0d0
4 files changed
+4
-6
contrib/plugins/traps.c
+1
-1
@@ -23,7 +23,7 @@ typedef struct {
23
24
static struct qemu_plugin_scoreboard *traps;
25
26
-static void vcpu_discon(qemu_plugin_id_t id, unsigned int vcpu_index,
26
+static void vcpu_discon(unsigned int vcpu_index,
27
enum qemu_plugin_discon_type type, uint64_t from_pc,
28
uint64_t to_pc, void *userdata)
29
{
include/plugins/qemu-plugin.h
+1
-3
@@ -180,7 +180,6 @@ enum qemu_plugin_discon_type {
180
181
/**
182
* typedef qemu_plugin_vcpu_discon_cb_t - vcpu discontinuity callback
183
- * @id: plugin ID
183
* @vcpu_index: the current vcpu context
184
* @type: the type of discontinuity
185
* @from_pc: the source of the discontinuity, e.g. the PC before the
@@ -196,8 +195,7 @@ enum qemu_plugin_discon_type {
195
* observable via general instruction exec callbacks. The same may be the case
196
* for some host calls such as hypervisor call "exceptions".
197
*/
199
-typedef void (*qemu_plugin_vcpu_discon_cb_t)(qemu_plugin_id_t id,
200
- unsigned int vcpu_index,
198
+typedef void (*qemu_plugin_vcpu_discon_cb_t)(unsigned int vcpu_index,
199
enum qemu_plugin_discon_type type,
200
uint64_t from_pc, uint64_t to_pc,
201
void *userdata);
plugins/core.c
+1
-1
@@ -122,7 +122,7 @@ static void plugin_vcpu_cb__discon(CPUState *cpu,
122
/* iterate safely; plugins might uninstall themselves at any time */
123
QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) {
124
qemu_plugin_vcpu_discon_cb_t func = cb->f.vcpu_discon;
125
- func(cb->ctx->id, cpu->cpu_index, type, from, to, cb->udata);
125
+ func(cpu->cpu_index, type, from, to, cb->udata);
126
}
127
}
128
qemu_plugin_set_cb_flags(cpu, QEMU_PLUGIN_CB_NO_REGS);
tests/tcg/plugins/discons.c
+1
-1
@@ -96,7 +96,7 @@ static void report_mismatch(const char *pc_name, unsigned int vcpu_index,
96
g_free(report);
97
}
98
99
-static void vcpu_discon(qemu_plugin_id_t id, unsigned int vcpu_index,
99
+static void vcpu_discon(unsigned int vcpu_index,
100
enum qemu_plugin_discon_type type, uint64_t from_pc,
101
uint64_t to_pc, void *userdata)
102
{