diff options
| author | Pierrick Bouvier <pierrick.bouvier@linaro.org> | 2024-06-20 16:22:19 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2024-06-24 10:15:16 +0100 |
| commit | ca7d7f4276d4fd4711b693a78fec79652cf2ffc5 (patch) | |
| tree | f9d5eea34a2da295aa1593a2c05f6c9ff770f072 | |
| parent | 72db6d54a4a9203736261fc63f32f6cd3486b7e4 (diff) | |
| download | qemu-ca7d7f4276d4fd4711b693a78fec79652cf2ffc5.zip qemu-ca7d7f4276d4fd4711b693a78fec79652cf2ffc5.tar.gz qemu-ca7d7f4276d4fd4711b693a78fec79652cf2ffc5.tar.bz2 | |
plugins: fix inject_mem_cb rw masking
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>
Message-Id: <20240620152220.2192768-12-alex.bennee@linaro.org>
| -rw-r--r-- | accel/tcg/plugin-gen.c | 4 | ||||
| -rw-r--r-- | 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 cc1634e..b6bae32 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 badede2..9d737d8 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; |