Re: [PATCH 2/3] migration/colo: make colo_incoming_co() return void

[Fabiano Rosas <farosas@suse.de>]

Li Zhijian via <qemu-devel@nongnu.org> writes:

> Currently, it always returns 0, no need to check the return value at all.
> In addition, enter colo coroutine only if migration_incoming_colo_enabled()
> is true.
> Once the destination side enters the COLO* state, the COLO process will
> take over the remaining processes until COLO exits.
>
> Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
> ---
>  migration/colo.c      | 9 ++-------
>  migration/migration.c | 6 +++---
>  2 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/migration/colo.c b/migration/colo.c
> index 5600a43d78..991806c06a 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -929,16 +929,13 @@ out:
>      return NULL;
>  }
>  
> -int coroutine_fn colo_incoming_co(void)
> +void coroutine_fn colo_incoming_co(void)
>  {
>      MigrationIncomingState *mis = migration_incoming_get_current();
>      QemuThread th;
>  
>      assert(bql_locked());
> -
> -    if (!migration_incoming_colo_enabled()) {
> -        return 0;
> -    }
> +    assert(migration_incoming_colo_enabled());

FAILED: libcommon.fa.p/migration_colo.c.o
/usr/bin/gcc-13 ... ../migration/colo.c
../migration/colo.c:930:19: error: conflicting types for ‘colo_incoming_co’; have ‘void(void)’
  930 | void coroutine_fn colo_incoming_co(void)
      |                   ^~~~~~~~~~~~~~~~
In file included from ../migration/colo.c:20:
... qemu/include/migration/colo.h:52:18: note: previous declaration of ‘colo_incoming_co’ with type ‘int(void)’
   52 | int coroutine_fn colo_incoming_co(void);
      |                  ^~~~~~~~~~~~~~~~