> -----Original Message-----
> From: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
> Sent: Saturday, April 29, 2023 3:49 AM
> To: qemu-devel@nongnu.org
> Cc: lukasstra...@web.de; quint...@redhat.com; Zhang, Chen
> <chen.zh...@intel.com>; vsement...@yandex-team.ru; Peter Xu
> <pet...@redhat.com>; Leonardo Bras <leob...@redhat.com>
> Subject: [PATCH v4 06/10] migration: process_incoming_migration_co:
> simplify code flow around ret
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
Reviewed-by: Zhang Chen <chen.zh...@intel.com>
Thanks
Chen
> ---
> migration/migration.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c index
> d4fa1a853c..8db0892317 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -533,8 +533,13 @@ process_incoming_migration_co(void *opaque)
> /* Else if something went wrong then just fall out of the normal
> exit */
> }
>
> + if (ret < 0) {
> + error_report("load of migration failed: %s", strerror(-ret));
> + goto fail;
> + }
> +
> /* we get COLO info, and know if we are in COLO mode */
> - if (!ret && migration_incoming_colo_enabled()) {
> + if (migration_incoming_colo_enabled()) {
> QemuThread colo_incoming_thread;
>
> /* Make sure all file formats throw away their mutable metadata */
> @@ -556,10 +561,6 @@ process_incoming_migration_co(void *opaque)
> colo_release_ram_cache();
> }
>
> - if (ret < 0) {
> - error_report("load of migration failed: %s", strerror(-ret));
> - goto fail;
> - }
> mis->bh = qemu_bh_new(process_incoming_migration_bh, mis);
> qemu_bh_schedule(mis->bh);
> mis->migration_incoming_co = NULL;
> --
> 2.34.1
