Re: [PATCH v2 4/5] coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h

[Markus Armbruster]

Markus Armbruster <armbru@redhat.com> writes:

> qemu/coroutine.h and qemu/lockable.h include each other.
>
> They need each other only in macro expansions, so we could simply drop
> both inclusions to break the loop, and add suitable includes to files
> that expand the macros.
>
> Instead, move a part of qemu/coroutine.h to new qemu/coroutine-core.h
> so that qemu/coroutine-core.h doesn't need qemu/lockable.h, and
> qemu/lockable.h only needs qemu/coroutine-core.h.  Result:
> qemu/coroutine.h includes qemu/lockable.h includes
> qemu/coroutine-core.h.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

[...]

> diff --git a/block.c b/block.c
> index 9c2ac757e4..be78be95f9 100644
> --- a/block.c
> +++ b/block.c
> @@ -44,7 +44,7 @@
>  #include "sysemu/block-backend.h"
>  #include "qemu/notify.h"
>  #include "qemu/option.h"
> -#include "qemu/coroutine.h"
> +#include "qemu/coroutine-core.h"
>  #include "block/qapi.h"
>  #include "qemu/timer.h"
>  #include "qemu/cutils.h"

Err, the include is useless before and after the patch: we get
coroutine.h from headers.  I'll drop the hunk to reduce churn.

Same for

    block/block-copy.c block/io_uring.c block/linux-aio.c block/mirror.c
    block/vdi.c chardev/char.c hw/9pfs/coth.c hw/block/virtio-blk.c
    migration/rdma.c net/colo-compare.c qapi/qmp-dispatch.c
    util/thread-pool.c

[...]