coroutine: Drop coroutine_fn annotation from qemu_coroutine_self()

[PATCH] coroutine: Drop coroutine_fn annotation from qemu_coroutine_self()

Posted by Alberto Faria 1 year, 6 months ago

qemu_coroutine_self() can be called from outside coroutine context,
returning the leader coroutine, and several such invocations currently
exist (mostly in qcow2 tracing calls).

Signed-off-by: Alberto Faria <afaria@redhat.com>
---
 include/qemu/coroutine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index c61dd2d3f7..c77ccd80f5 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -122,7 +122,7 @@ AioContext *coroutine_fn qemu_coroutine_get_aio_context(Coroutine *co);
 /**
  * Get the currently executing coroutine
  */
-Coroutine *coroutine_fn qemu_coroutine_self(void);
+Coroutine *qemu_coroutine_self(void);
 
 /**
  * Return whether or not currently inside a coroutine
-- 
2.37.3

Re: [PATCH] coroutine: Drop coroutine_fn annotation from qemu_coroutine_self()

Posted by Kevin Wolf 1 year, 6 months ago

Am 05.10.2022 um 19:52 hat Alberto Faria geschrieben:
> qemu_coroutine_self() can be called from outside coroutine context,
> returning the leader coroutine, and several such invocations currently
> exist (mostly in qcow2 tracing calls).
> 
> Signed-off-by: Alberto Faria <afaria@redhat.com>

Thanks, applied to the block branch.

Kevin

Re: [PATCH] coroutine: Drop coroutine_fn annotation from qemu_coroutine_self()

Posted by Paolo Bonzini 1 year, 6 months ago

On 10/5/22 19:52, Alberto Faria wrote:
> qemu_coroutine_self() can be called from outside coroutine context,
> returning the leader coroutine, and several such invocations currently
> exist (mostly in qcow2 tracing calls).
> 
> Signed-off-by: Alberto Faria <afaria@redhat.com>
> ---
>   include/qemu/coroutine.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
> index c61dd2d3f7..c77ccd80f5 100644
> --- a/include/qemu/coroutine.h
> +++ b/include/qemu/coroutine.h
> @@ -122,7 +122,7 @@ AioContext *coroutine_fn qemu_coroutine_get_aio_context(Coroutine *co);
>   /**
>    * Get the currently executing coroutine
>    */
> -Coroutine *coroutine_fn qemu_coroutine_self(void);
> +Coroutine *qemu_coroutine_self(void);
>   
>   /**
>    * Return whether or not currently inside a coroutine

The alternative would be to have two versions, one that is coroutine_fn 
and one that isn't, but this is certainly okay too!

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo