| Message ID | 20240620152220.2192768-12-alex.bennee@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | maintainer updates pre-PR (gdbstub, plugins, time control) | expand |
Reviewed-by: Alwalid Salama <quic_asalama@qualcomm.com> On 6/20/2024 5:22 PM, Alex Bennée wrote: > From: Pierrick Bouvier <pierrick.bouvier@linaro.org> > > These are not booleans, but masks. > Issue found by Richard Henderson. > > Fixes: f86fd4d8721 ("plugins: distinct types for callbacks") > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > Message-Id: <20240612195147.93121-3-pierrick.bouvier@linaro.org> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > accel/tcg/plugin-gen.c | 4 ++-- > plugins/core.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c > index cc1634e7a6..b6bae32b99 100644 > --- a/accel/tcg/plugin-gen.c > +++ b/accel/tcg/plugin-gen.c > @@ -240,13 +240,13 @@ static void inject_mem_cb(struct qemu_plugin_dyn_cb *cb, > { > switch (cb->type) { > case PLUGIN_CB_MEM_REGULAR: > - if (rw && cb->regular.rw) { > + if (rw & cb->regular.rw) { > gen_mem_cb(&cb->regular, meminfo, addr); > } > break; > case PLUGIN_CB_INLINE_ADD_U64: > case PLUGIN_CB_INLINE_STORE_U64: > - if (rw && cb->inline_insn.rw) { > + if (rw & cb->inline_insn.rw) { > inject_cb(cb); > } > break; > diff --git a/plugins/core.c b/plugins/core.c > index badede28cf..9d737d8278 100644 > --- a/plugins/core.c > +++ b/plugins/core.c > @@ -589,7 +589,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, > > switch (cb->type) { > case PLUGIN_CB_MEM_REGULAR: > - if (rw && cb->regular.rw) { > + if (rw & cb->regular.rw) { > cb->regular.f.vcpu_mem(cpu->cpu_index, > make_plugin_meminfo(oi, rw), > vaddr, cb->regular.userp); > @@ -597,7 +597,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, > break; > case PLUGIN_CB_INLINE_ADD_U64: > case PLUGIN_CB_INLINE_STORE_U64: > - if (rw && cb->inline_insn.rw) { > + if (rw & cb->inline_insn.rw) { > exec_inline_op(cb->type, &cb->inline_insn, cpu->cpu_index); > } > break;
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index cc1634e7a6..b6bae32b99 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -240,13 +240,13 @@ static void inject_mem_cb(struct qemu_plugin_dyn_cb *cb, { switch (cb->type) { case PLUGIN_CB_MEM_REGULAR: - if (rw && cb->regular.rw) { + if (rw & cb->regular.rw) { gen_mem_cb(&cb->regular, meminfo, addr); } break; case PLUGIN_CB_INLINE_ADD_U64: case PLUGIN_CB_INLINE_STORE_U64: - if (rw && cb->inline_insn.rw) { + if (rw & cb->inline_insn.rw) { inject_cb(cb); } break; diff --git a/plugins/core.c b/plugins/core.c index badede28cf..9d737d8278 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -589,7 +589,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, switch (cb->type) { case PLUGIN_CB_MEM_REGULAR: - if (rw && cb->regular.rw) { + if (rw & cb->regular.rw) { cb->regular.f.vcpu_mem(cpu->cpu_index, make_plugin_meminfo(oi, rw), vaddr, cb->regular.userp); @@ -597,7 +597,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, break; case PLUGIN_CB_INLINE_ADD_U64: case PLUGIN_CB_INLINE_STORE_U64: - if (rw && cb->inline_insn.rw) { + if (rw & cb->inline_insn.rw) { exec_inline_op(cb->type, &cb->inline_insn, cpu->cpu_index); } break;