accel/tcg/plugin-gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
These are not booleans, but masks.
Fixes: f86fd4d8721 ("plugins: distinct types for callbacks")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/plugin-gen.c | 4 ++--
1 file changed, 2 insertions(+), 2 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;
--
2.34.1
Thanks for catching this Richard.
I did the same mistake in plugins/core.c as well, could you fix it as
well as part of this patch?
For complement, rw are enums,
R is 0b01, W is 0b10, and RW is 0b11, thus it work as expected with &.
Thanks,
Pierrick
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
On 6/5/24 15:25, Richard Henderson wrote:
> These are not booleans, but masks.
>
> Fixes: f86fd4d8721 ("plugins: distinct types for callbacks")
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/plugin-gen.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 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;
On 6/5/24 15:39, Pierrick Bouvier wrote:
> Thanks for catching this Richard.
>
> I did the same mistake in plugins/core.c as well, could you fix it as
> well as part of this patch?
>
> For complement, rw are enums,
> R is 0b01, W is 0b10, and RW is 0b11, thus it work as expected with &.
>
> Thanks,
> Pierrick
>
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>
> On 6/5/24 15:25, Richard Henderson wrote:
>> These are not booleans, but masks.
>>
>> Fixes: f86fd4d8721 ("plugins: distinct types for callbacks")
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> accel/tcg/plugin-gen.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 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;
I sent a new series with your fix + other in plugins/core.c, so no
action is needed from you.
(20240612195147.93121-1-pierrick.bouvier@linaro.org)
Thanks,
Pierrick
© 2016 - 2026 Red Hat, Inc.