Re: [PATCH 09/25] plugins: add userdata to qemu_plugin_register_vcpu_idle_cb

[Manos Pitsidianakis <manos.pitsidianakis@linaro.org>]

On Wed, 03 Jun 2026 23:51, Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> wrote:
>Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>---

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

> include/plugins/qemu-plugin.h | 4 +++-
> plugins/core.c                | 9 +++++----
> tests/tcg/plugins/bb.c        | 4 ++--
> 3 files changed, 10 insertions(+), 7 deletions(-)
>
>diff --git a/include/plugins/qemu-plugin.h b/include/plugins/qemu-plugin.h
>index d4f8a99027e..75d2a69a3bd 100644
>--- a/include/plugins/qemu-plugin.h
>+++ b/include/plugins/qemu-plugin.h
>@@ -272,12 +272,14 @@ void qemu_plugin_register_vcpu_exit_cb(qemu_plugin_id_t id,
>  * qemu_plugin_register_vcpu_idle_cb() - register a vCPU idle callback
>  * @id: plugin ID
>  * @cb: callback function
>+ * @userdata: any plugin data to pass to the @cb
>  *
>  * The @cb function is called every time a vCPU idles.
>  */
> QEMU_PLUGIN_API
> void qemu_plugin_register_vcpu_idle_cb(qemu_plugin_id_t id,
>-                                       qemu_plugin_vcpu_simple_cb_t cb);
>+                                       qemu_plugin_vcpu_udata_cb_t cb,
>+                                       void *userdata);
> 
> /**
>  * qemu_plugin_register_vcpu_resume_cb() - register a vCPU resume callback
>diff --git a/plugins/core.c b/plugins/core.c
>index 15fb548f68c..111ceeea285 100644
>--- a/plugins/core.c
>+++ b/plugins/core.c
>@@ -89,7 +89,6 @@ static void plugin_vcpu_cb__simple(CPUState *cpu, enum qemu_plugin_event ev)
>     struct qemu_plugin_cb *cb, *next;
> 
>     switch (ev) {
>-    case QEMU_PLUGIN_EV_VCPU_IDLE:
>     case QEMU_PLUGIN_EV_VCPU_RESUME:
>         /* iterate safely; plugins might uninstall themselves at any time */
>         QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) {
>@@ -114,6 +113,7 @@ static void plugin_vcpu_cb__udata(CPUState *cpu, enum qemu_plugin_event ev)
> 
>     switch (ev) {
>     case QEMU_PLUGIN_EV_VCPU_INIT:
>+    case QEMU_PLUGIN_EV_VCPU_IDLE:
>     case QEMU_PLUGIN_EV_VCPU_EXIT:
>         QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) {
>             qemu_plugin_vcpu_udata_cb_t func = cb->f.vcpu_udata;
>@@ -626,7 +626,7 @@ void qemu_plugin_vcpu_idle_cb(CPUState *cpu)
>     /* idle and resume cb may be called before init, ignore in this case */
>     if (cpu->cpu_index < plugin.num_vcpus) {
>         qemu_plugin_set_cb_flags(cpu, QEMU_PLUGIN_CB_RW_REGS_PC);
>-        plugin_vcpu_cb__simple(cpu, QEMU_PLUGIN_EV_VCPU_IDLE);
>+        plugin_vcpu_cb__udata(cpu, QEMU_PLUGIN_EV_VCPU_IDLE);
>         qemu_plugin_set_cb_flags(cpu, QEMU_PLUGIN_CB_NO_REGS);
>     }
> }
>@@ -659,9 +659,10 @@ void qemu_plugin_vcpu_hostcall_cb(CPUState *cpu, uint64_t from)
> }
> 
> void qemu_plugin_register_vcpu_idle_cb(qemu_plugin_id_t id,
>-                                       qemu_plugin_vcpu_simple_cb_t cb)
>+                                       qemu_plugin_vcpu_udata_cb_t cb,
>+                                       void *userdata)
> {
>-    plugin_register_cb(id, QEMU_PLUGIN_EV_VCPU_IDLE, cb);
>+    plugin_register_cb_udata(id, QEMU_PLUGIN_EV_VCPU_IDLE, cb, userdata);
> }
> 
> void qemu_plugin_register_vcpu_resume_cb(qemu_plugin_id_t id,
>diff --git a/tests/tcg/plugins/bb.c b/tests/tcg/plugins/bb.c
>index f29b466dab2..ba605246eb0 100644
>--- a/tests/tcg/plugins/bb.c
>+++ b/tests/tcg/plugins/bb.c
>@@ -56,7 +56,7 @@ static void plugin_exit(void *p)
>     qemu_plugin_scoreboard_free(counts);
> }
> 
>-static void vcpu_idle(unsigned int cpu_index)
>+static void vcpu_idle(unsigned int cpu_index, void *userdata)
> {
>     CPUCount *count = qemu_plugin_scoreboard_find(counts, cpu_index);
>     g_autoptr(GString) report = g_string_new("");
>@@ -124,7 +124,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
>         counts, CPUCount, insn_count);
> 
>     if (idle_report) {
>-        qemu_plugin_register_vcpu_idle_cb(id, vcpu_idle);
>+        qemu_plugin_register_vcpu_idle_cb(id, vcpu_idle, NULL);
>     }
> 
>     qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
>-- 
>2.43.0
>
>