| Message ID | 20240316015720.3661236-17-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | plugins: Rewrite plugin code generation | expand |
On 3/16/24 05:57, Richard Henderson wrote: > Use different enumerators for vcpu_udata and vcpu_mem callbacks. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/qemu/plugin.h | 1 + > accel/tcg/plugin-gen.c | 2 +- > plugins/core.c | 4 ++-- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h > index cf9758be55..34498da717 100644 > --- a/include/qemu/plugin.h > +++ b/include/qemu/plugin.h > @@ -67,6 +67,7 @@ union qemu_plugin_cb_sig { > > enum plugin_dyn_cb_type { > PLUGIN_CB_REGULAR, > + PLUGIN_CB_MEM_REGULAR, > PLUGIN_CB_INLINE, > }; > > diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c > index 669e343cfb..6f0731b479 100644 > --- a/accel/tcg/plugin-gen.c > +++ b/accel/tcg/plugin-gen.c > @@ -367,7 +367,7 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) > > if (cb->rw & rw) { > switch (cb->type) { > - case PLUGIN_CB_REGULAR: > + case PLUGIN_CB_MEM_REGULAR: > gen_mem_cb(cb, meminfo, addr); > break; > case PLUGIN_CB_INLINE: > diff --git a/plugins/core.c b/plugins/core.c > index b0615f1e7f..0213513ec6 100644 > --- a/plugins/core.c > +++ b/plugins/core.c > @@ -391,7 +391,7 @@ void plugin_register_vcpu_mem_cb(GArray **arr, > > struct qemu_plugin_dyn_cb *dyn_cb = plugin_get_dyn_cb(arr); > dyn_cb->userp = udata; > - dyn_cb->type = PLUGIN_CB_REGULAR; > + dyn_cb->type = PLUGIN_CB_MEM_REGULAR; > dyn_cb->rw = rw; > dyn_cb->regular.f.vcpu_mem = cb; > > @@ -547,7 +547,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, > break; > } > switch (cb->type) { > - case PLUGIN_CB_REGULAR: > + case PLUGIN_CB_MEM_REGULAR: > cb->regular.f.vcpu_mem(cpu->cpu_index, make_plugin_meminfo(oi, rw), > vaddr, cb->userp); > break; Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index cf9758be55..34498da717 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -67,6 +67,7 @@ union qemu_plugin_cb_sig { enum plugin_dyn_cb_type { PLUGIN_CB_REGULAR, + PLUGIN_CB_MEM_REGULAR, PLUGIN_CB_INLINE, }; diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 669e343cfb..6f0731b479 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -367,7 +367,7 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) if (cb->rw & rw) { switch (cb->type) { - case PLUGIN_CB_REGULAR: + case PLUGIN_CB_MEM_REGULAR: gen_mem_cb(cb, meminfo, addr); break; case PLUGIN_CB_INLINE: diff --git a/plugins/core.c b/plugins/core.c index b0615f1e7f..0213513ec6 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -391,7 +391,7 @@ void plugin_register_vcpu_mem_cb(GArray **arr, struct qemu_plugin_dyn_cb *dyn_cb = plugin_get_dyn_cb(arr); dyn_cb->userp = udata; - dyn_cb->type = PLUGIN_CB_REGULAR; + dyn_cb->type = PLUGIN_CB_MEM_REGULAR; dyn_cb->rw = rw; dyn_cb->regular.f.vcpu_mem = cb; @@ -547,7 +547,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, break; } switch (cb->type) { - case PLUGIN_CB_REGULAR: + case PLUGIN_CB_MEM_REGULAR: cb->regular.f.vcpu_mem(cpu->cpu_index, make_plugin_meminfo(oi, rw), vaddr, cb->userp); break;
Use different enumerators for vcpu_udata and vcpu_mem callbacks. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/qemu/plugin.h | 1 + accel/tcg/plugin-gen.c | 2 +- plugins/core.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-)