On Wed, 03 Jun 2026 23:51, Pierrick Bouvier <[email protected]>
wrote:
Signed-off-by: Pierrick Bouvier <[email protected]>
---
Reviewed-by: Manos Pitsidianakis <[email protected]>
contrib/plugins/traps.c | 2 +-
include/plugins/qemu-plugin.h | 4 +---
plugins/core.c | 2 +-
tests/tcg/plugins/discons.c | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/contrib/plugins/traps.c b/contrib/plugins/traps.c
index 4d59aa3c09d..b6df4455d63 100644
--- a/contrib/plugins/traps.c
+++ b/contrib/plugins/traps.c
@@ -23,7 +23,7 @@ typedef struct {
static struct qemu_plugin_scoreboard *traps;
-static void vcpu_discon(qemu_plugin_id_t id, unsigned int vcpu_index,
+static void vcpu_discon(unsigned int vcpu_index,
enum qemu_plugin_discon_type type, uint64_t from_pc,
uint64_t to_pc, void *userdata)
{
diff --git a/include/plugins/qemu-plugin.h b/include/plugins/qemu-plugin.h
index 03e7b2b1fb8..60d27d8d9c1 100644
--- a/include/plugins/qemu-plugin.h
+++ b/include/plugins/qemu-plugin.h
@@ -180,7 +180,6 @@ enum qemu_plugin_discon_type {
/**
* typedef qemu_plugin_vcpu_discon_cb_t - vcpu discontinuity callback
- * @id: plugin ID
* @vcpu_index: the current vcpu context
* @type: the type of discontinuity
* @from_pc: the source of the discontinuity, e.g. the PC before the
@@ -196,8 +195,7 @@ enum qemu_plugin_discon_type {
* observable via general instruction exec callbacks. The same may be the case
* for some host calls such as hypervisor call "exceptions".
*/
-typedef void (*qemu_plugin_vcpu_discon_cb_t)(qemu_plugin_id_t id,
- unsigned int vcpu_index,
+typedef void (*qemu_plugin_vcpu_discon_cb_t)(unsigned int vcpu_index,
enum qemu_plugin_discon_type type,
uint64_t from_pc, uint64_t to_pc,
void *userdata);
diff --git a/plugins/core.c b/plugins/core.c
index 54ab3bdbedc..3c3212aedda 100644
--- a/plugins/core.c
+++ b/plugins/core.c
@@ -122,7 +122,7 @@ static void plugin_vcpu_cb__discon(CPUState *cpu,
/* iterate safely; plugins might uninstall themselves at any time */
QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) {
qemu_plugin_vcpu_discon_cb_t func = cb->f.vcpu_discon;
- func(cb->ctx->id, cpu->cpu_index, type, from, to, cb->udata);
+ func(cpu->cpu_index, type, from, to, cb->udata);
}
}
qemu_plugin_set_cb_flags(cpu, QEMU_PLUGIN_CB_NO_REGS);
diff --git a/tests/tcg/plugins/discons.c b/tests/tcg/plugins/discons.c
index 22114830fdc..5ab645705e3 100644
--- a/tests/tcg/plugins/discons.c
+++ b/tests/tcg/plugins/discons.c
@@ -96,7 +96,7 @@ static void report_mismatch(const char *pc_name, unsigned int
vcpu_index,
g_free(report);
}
-static void vcpu_discon(qemu_plugin_id_t id, unsigned int vcpu_index,
+static void vcpu_discon(unsigned int vcpu_index,
enum qemu_plugin_discon_type type, uint64_t from_pc,
uint64_t to_pc, void *userdata)
{
--
2.43.0
