Re: [PATCH 19/25] plugins: remove qemu_plugin_id from qemu_plugin_vcpu_syscall_filter_cb_t

[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                | 2 +-
> tests/tcg/plugins/setpc.c     | 2 +-
> tests/tcg/plugins/syscall.c   | 2 +-
> 4 files changed, 4 insertions(+), 6 deletions(-)
>
>diff --git a/include/plugins/qemu-plugin.h b/include/plugins/qemu-plugin.h
>index 909f19b7128..c38ae7db1b3 100644
>--- a/include/plugins/qemu-plugin.h
>+++ b/include/plugins/qemu-plugin.h
>@@ -852,7 +852,6 @@ typedef void
> /**
>  * typedef qemu_plugin_vcpu_syscall_filter_cb_t - vCPU syscall filter callback
>  * function type
>- * @id: plugin id
>  * @vcpu_index: the executing vCPU
>  * @num: the syscall number
>  * @a1: the 1st syscall argument
>@@ -869,8 +868,7 @@ typedef void
>  * handled further), otherwise returns false.
>  */
> typedef bool
>-(*qemu_plugin_vcpu_syscall_filter_cb_t)(qemu_plugin_id_t id,
>-                                        unsigned int vcpu_index,
>+(*qemu_plugin_vcpu_syscall_filter_cb_t)(unsigned int vcpu_index,
>                                         int64_t num, uint64_t a1, uint64_t a2,
>                                         uint64_t a3, uint64_t a4, uint64_t a5,
>                                         uint64_t a6, uint64_t a7, uint64_t a8,
>diff --git a/plugins/core.c b/plugins/core.c
>index 45136bf950a..987e49b89cd 100644
>--- a/plugins/core.c
>+++ b/plugins/core.c
>@@ -589,7 +589,7 @@ qemu_plugin_vcpu_syscall_filter(CPUState *cpu, int64_t num, uint64_t a1,
>     QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) {
>         qemu_plugin_vcpu_syscall_filter_cb_t func = cb->f.vcpu_syscall_filter;
> 
>-        if (func(cb->ctx->id, cpu->cpu_index, num, a1, a2, a3, a4,
>+        if (func(cpu->cpu_index, num, a1, a2, a3, a4,
>                  a5, a6, a7, a8, sysret)) {
>             filtered = true;
>             break;
>diff --git a/tests/tcg/plugins/setpc.c b/tests/tcg/plugins/setpc.c
>index 595571cdfd9..9bb5bf0f5f7 100644
>--- a/tests/tcg/plugins/setpc.c
>+++ b/tests/tcg/plugins/setpc.c
>@@ -23,7 +23,7 @@ static uint64_t source_pc;
> static uint64_t target_pc;
> static uint64_t target_vaddr;
> 
>-static bool vcpu_syscall_filter(qemu_plugin_id_t id, unsigned int vcpu_index,
>+static bool vcpu_syscall_filter(unsigned int vcpu_index,
>                                 int64_t num, uint64_t a1, uint64_t a2,
>                                 uint64_t a3, uint64_t a4, uint64_t a5,
>                                 uint64_t a6, uint64_t a7, uint64_t a8,
>diff --git a/tests/tcg/plugins/syscall.c b/tests/tcg/plugins/syscall.c
>index 8a823acfca7..2afd71895e3 100644
>--- a/tests/tcg/plugins/syscall.c
>+++ b/tests/tcg/plugins/syscall.c
>@@ -171,7 +171,7 @@ static void vcpu_syscall_ret(qemu_plugin_id_t id, unsigned int vcpu_idx,
>     }
> }
> 
>-static bool vcpu_syscall_filter(qemu_plugin_id_t id, unsigned int vcpu_index,
>+static bool vcpu_syscall_filter(unsigned int vcpu_index,
>                                 int64_t num, uint64_t a1, uint64_t a2,
>                                 uint64_t a3, uint64_t a4, uint64_t a5,
>                                 uint64_t a6, uint64_t a7, uint64_t a8,
>-- 
>2.43.0
>
>