[{"id":3629496,"web_url":"http://patchwork.ozlabs.org/comment/3629496/","msgid":"<aVLLeZQm376POJ0t@x1.local>","list_archive_url":null,"date":"2025-12-29T18:42:01","subject":"Re: [RFC PATCH 12/25] migration: Fold migration_cleanup() into\n migration_connect_error_propagate()","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/people/67717/","name":"Peter Xu","email":"peterx@redhat.com"},"content":"On Fri, Dec 26, 2025 at 06:19:14PM -0300, Fabiano Rosas wrote:\n> Whenever an error occurs between migrate_init() and the start of\n> migration_thread, do cleanup immediately after.\n> \n> This allows the special casing for resume to be removed from\n> migration_connect(), that check is now done at\n> migration_connect_error_propagate() which already had a case for\n> resume.\n> \n> Signed-off-by: Fabiano Rosas <farosas@suse.de>\n\nDidn't spot anything wrong,\n\nReviewed-by: Peter Xu <peterx@redhat.com>\n\nOne nitpick below,\n\n> ---\n>  migration/migration.c | 42 +++++++++++++++++++++++++++---------------\n>  1 file changed, 27 insertions(+), 15 deletions(-)\n> \n> diff --git a/migration/migration.c b/migration/migration.c\n> index 0f1644b276..a66b2d7aaf 100644\n> --- a/migration/migration.c\n> +++ b/migration/migration.c\n> @@ -1576,15 +1576,21 @@ static void migration_connect_error_propagate(MigrationState *s, Error *error)\n>  {\n>      MigrationStatus current = s->state;\n>      MigrationStatus next = MIGRATION_STATUS_NONE;\n> +    bool resume = false;\n>  \n>      switch (current) {\n>      case MIGRATION_STATUS_SETUP:\n>          next = MIGRATION_STATUS_FAILED;\n>          break;\n>  \n> +    case MIGRATION_STATUS_POSTCOPY_PAUSED:\n> +        resume = true;\n> +        break;\n> +\n>      case MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP:\n>          /* Never fail a postcopy migration; switch back to PAUSED instead */\n>          next = MIGRATION_STATUS_POSTCOPY_PAUSED;\n> +        resume = true;\n>          break;\n>  \n>      case MIGRATION_STATUS_CANCELLING:\n> @@ -1609,6 +1615,10 @@ static void migration_connect_error_propagate(MigrationState *s, Error *error)\n>      }\n>  \n>      migrate_error_propagate(s, error);\n> +\n> +    if (!resume) {\n> +        migration_cleanup(s);\n> +    }\n>  }\n>  \n>  void migration_cancel(void)\n> @@ -2209,12 +2219,19 @@ static gboolean qmp_migrate_finish_cb(QIOChannel *channel,\n>                                        GIOCondition cond,\n>                                        void *opaque)\n>  {\n> +    MigrationState *s = migrate_get_current();\n>      MigrationAddress *addr = opaque;\n> +    Error *local_err = NULL;\n> +\n> +    qmp_migrate_finish(addr, &local_err);\n> +\n> +    if (local_err) {\n> +        migration_connect_error_propagate(s, local_err);\n> +    }\n>  \n> -    qmp_migrate_finish(addr, NULL);\n>  \n>      cpr_state_close();\n> -    migrate_hup_delete(migrate_get_current());\n> +    migrate_hup_delete(s);\n\nIMHO we should drop these two lines.  For error cases, now they'll be done\nin migration_cleanup() above.  Actually for success, it's the same, but in\nthe cleanup BH.\n\nMaybe there're other cases where we can clean the code a bit on cpr;\nthere're codes that always does \"if (xxx)\" and calling them all over the\nplaces, so it's easy to write such code when drafting a feature, but hard\nto maintain, because it'll be obscure when it'll really trigger, like this\none.  We can leave the rest for later if there're applicable similar\ncleanups.\n\n>      qapi_free_MigrationAddress(addr);\n>      return G_SOURCE_REMOVE;\n>  }\n> @@ -2223,7 +2240,6 @@ void qmp_migrate(const char *uri, bool has_channels,\n>                   MigrationChannelList *channels, bool has_detach, bool detach,\n>                   bool has_resume, bool resume, Error **errp)\n>  {\n> -    Error *local_err = NULL;\n>      MigrationState *s = migrate_get_current();\n>      g_autoptr(MigrationChannel) channel = NULL;\n>      MigrationAddress *addr = NULL;\n> @@ -2280,6 +2296,13 @@ void qmp_migrate(const char *uri, bool has_channels,\n>          return;\n>      }\n>  \n> +    /*\n> +     * The migrate_prepare() above calls migrate_init(). From this\n> +     * point on, until the end of migration, make sure any failures\n> +     * eventually result in a call to migration_cleanup().\n> +     */\n> +    Error *local_err = NULL;\n> +\n>      if (!cpr_state_save(cpr_channel, &local_err)) {\n>          goto out;\n>      }\n> @@ -2299,12 +2322,11 @@ void qmp_migrate(const char *uri, bool has_channels,\n>                          QAPI_CLONE(MigrationAddress, addr));\n>  \n>      } else {\n> -        qmp_migrate_finish(addr, errp);\n> +        qmp_migrate_finish(addr, &local_err);\n>      }\n>  \n>  out:\n>      if (local_err) {\n> -        yank_unregister_instance(MIGRATION_YANK_INSTANCE);\n>          migration_connect_error_propagate(s, error_copy(local_err));\n>          error_propagate(errp, local_err);\n>      }\n> @@ -2335,12 +2357,6 @@ static void qmp_migrate_finish(MigrationAddress *addr, Error **errp)\n>      } else {\n>          error_setg(&local_err, \"uri is not a valid migration protocol\");\n>      }\n> -\n> -    if (local_err) {\n> -        migration_connect_error_propagate(s, error_copy(local_err));\n> -        error_propagate(errp, local_err);\n> -        return;\n> -    }\n>  }\n>  \n>  void qmp_migrate_cancel(Error **errp)\n> @@ -4027,9 +4043,6 @@ void migration_connect(MigrationState *s, Error *error_in)\n>      s->expected_downtime = migrate_downtime_limit();\n>      if (error_in) {\n>          migration_connect_error_propagate(s, error_in);\n> -        if (!resume) {\n> -            migration_cleanup(s);\n> -        }\n>          if (s->error) {\n>              error_report_err(error_copy(s->error));\n>          }\n> @@ -4108,7 +4121,6 @@ void migration_connect(MigrationState *s, Error *error_in)\n>  \n>  fail:\n>      migration_connect_error_propagate(s, local_err);\n> -    migration_cleanup(s);\n>      if (s->error) {\n>          error_report_err(error_copy(s->error));\n>      }\n> -- \n> 2.51.0\n>","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=QUA/gxKB;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=google header.b=d9fRh5EB;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4dg4pF21K9z1xpV\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 30 Dec 2025 05:42:29 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vaICA-0000fh-5p; Mon, 29 Dec 2025 13:42:18 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <peterx@redhat.com>) id 1vaIC6-0000bF-Os\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 13:42:16 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <peterx@redhat.com>) id 1vaIC1-0007Wp-VC\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 13:42:12 -0500","from mail-qk1-f197.google.com (mail-qk1-f197.google.com\n [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-17-ski6NZXROo2FrpesIPx1AQ-1; Mon, 29 Dec 2025 13:42:03 -0500","by mail-qk1-f197.google.com with SMTP id\n af79cd13be357-8b22d590227so1082465685a.1\n for <qemu-devel@nongnu.org>; Mon, 29 Dec 2025 10:42:03 -0800 (PST)","from x1.local ([142.188.210.156]) by smtp.gmail.com with ESMTPSA id\n 6a1803df08f44-88d99d7e8d4sm241690756d6.41.2025.12.29.10.42.02\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 29 Dec 2025 10:42:02 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1767033725;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n in-reply-to:in-reply-to:references:references;\n bh=Q0VpudXbOuwgvKi3M2nVEq4u6PHjiT6r0dq7IP+SJls=;\n b=QUA/gxKB4BXbj7h6NM+lrjUfEG8a4QENv05W8hVAj3TQaWcLkqRSZtqqjDvx8xTJ9mr15Y\n CiHiGZ8GGA6+jVyEsgMrc7CpuWR7k2nWnoLgsllLTu1VoCsbwUITkYHCxo52Ol9y5lgRIi\n THSMQj/2d1axim77N/e2ZEB/af8loI8=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1767033723; x=1767638523; darn=nongnu.org;\n h=in-reply-to:content-disposition:mime-version:references:message-id\n :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to;\n bh=Q0VpudXbOuwgvKi3M2nVEq4u6PHjiT6r0dq7IP+SJls=;\n b=d9fRh5EB/V0qTP9xLoXK7VDbP5WZg0fTD42CuwFvGoH4zSJ1EWAoeibmUg19grfD4x\n FABWBss+OFaBjWC2lnPlnb5uc7bGvBudIQv0/QQN6lSzvdeBPuseiblet5QNJiWXW+QN\n kVhYBh+kzRz7W80vaqFGS99AoCKk2ONk/pHtw3KTIdEdOvTemEUglcRyo4DvUrkGTCoJ\n k1QsAlrnAClqsbnNLPA98OsRqDAGqqPdoew3bFVl/g2Hm3+ZKkD3ephbaw1hrkttTZBp\n MoVjlUBwugYXUSdjxl7KJeTzc653SIAnTTDZ5N6ycO9nOO1ly4hcw+IrrUb3NOw8sgQh\n WP4A=="],"X-MC-Unique":"ski6NZXROo2FrpesIPx1AQ-1","X-Mimecast-MFC-AGG-ID":"ski6NZXROo2FrpesIPx1AQ_1767033723","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1767033723; x=1767638523;\n h=in-reply-to:content-disposition:mime-version:references:message-id\n :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=Q0VpudXbOuwgvKi3M2nVEq4u6PHjiT6r0dq7IP+SJls=;\n b=Hld3Gxk+EqkeAT5J68rDWeJXCinqNto7xH5ZtCY6UY6DzQvgF0Y+XzJRH30J3uoX2l\n pp+EjFaVBVWCUH9kyUNRW8W3LOPwl1yJurfelky1boTG8kBqVxwXXNqREifwjhWH9WxS\n lUjTqrXcui7KnZetR7dPJ5tCFUfuUTPNAsq3Rk3aN5QfFHQOzMwiCBh+Wa22w9QDpXfQ\n ofmNJ0SWlbif8E4t8xaeIZi4bqOgpf4gWXpGU9XJrm/3Z2//sPbxFF9tiDlL4vK6OZvH\n 67nuH7KdPuafgdonmE9jAftxRznnQEMOtIKHhdEPtDsm9MR4IVg0fofpqZDHY2UVEmkt\n mp+g==","X-Gm-Message-State":"AOJu0YxJVJou4WyDMwhZTE4oG9sb1xRyvNo2SIj8LjCs7EiQWJh5+ZVA\n iQefYFumtBQKYtJc+QQLfK6p2yfPZjUSbDP2gl5c+pBuMY8HZJ4ocJkjTgmWemnqAvyEJbXa0Ru\n wcHdItGBda6PELVya1leQVlkbaAnpDapYyxX3JWUYUoZt5Df4iElP1DNQ","X-Gm-Gg":"AY/fxX4ey6Yx5gDgqZ80MUPrEWeBGeSQQ/Ubxl57W4VJYhyTWSYb+mWYE8IIcGzVvA0\n VYBK9KTbTUzZfsgJNuZmLLf8OWDdcze1UB2Lvx2fSaVIHMfggm4bzrG1GmVAJYYUeYVIoaw54YZ\n DMOy+i0wwzXyHryaqUzswMkJlxAl8nGsIKL+e1puQWq0xsZedUszbRqAQEHFdytqM9gR87TMILv\n LoMLNJ662deRGWhLNdovj/7IypE0uUErYZoKQq5CLLzYHQMCpy4AcTMc/YV+Lyb+vBxc/EkNqKB\n FwUipQjXGiP3O12zzWguRrQn+I/gpxcNxnXKWZq+J6iweWT+agiYK2Yt+SLZmeGhSBdoqPpHoNU\n fmXY=","X-Received":["by 2002:a05:620a:1a0c:b0:89e:a9ea:a374 with SMTP id\n af79cd13be357-8c08ff20edfmr4359169885a.67.1767033723122;\n Mon, 29 Dec 2025 10:42:03 -0800 (PST)","by 2002:a05:620a:1a0c:b0:89e:a9ea:a374 with SMTP id\n af79cd13be357-8c08ff20edfmr4359166685a.67.1767033722575;\n Mon, 29 Dec 2025 10:42:02 -0800 (PST)"],"X-Google-Smtp-Source":"\n AGHT+IG3VR04jOM6M+lPU6WUQo0AzSw7ZxLR7MV8sCqPzooxBhSCVXKnqjdpg2AuUIslF9VBEMKLvQ==","Date":"Mon, 29 Dec 2025 13:42:01 -0500","From":"Peter Xu <peterx@redhat.com>","To":"Fabiano Rosas <farosas@suse.de>","Cc":"qemu-devel@nongnu.org","Subject":"Re: [RFC PATCH 12/25] migration: Fold migration_cleanup() into\n migration_connect_error_propagate()","Message-ID":"<aVLLeZQm376POJ0t@x1.local>","References":"<20251226211930.27565-1-farosas@suse.de>\n <20251226211930.27565-13-farosas@suse.de>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20251226211930.27565-13-farosas@suse.de>","Received-SPF":"pass client-ip=170.10.129.124; envelope-from=peterx@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"}},{"id":3629511,"web_url":"http://patchwork.ozlabs.org/comment/3629511/","msgid":"<87ikdp84xx.fsf@suse.de>","list_archive_url":null,"date":"2025-12-29T19:26:50","subject":"Re: [RFC PATCH 12/25] migration: Fold migration_cleanup() into\n migration_connect_error_propagate()","submitter":{"id":85343,"url":"http://patchwork.ozlabs.org/api/people/85343/","name":"Fabiano Rosas","email":"farosas@suse.de"},"content":"Peter Xu <peterx@redhat.com> writes:\n\n> On Fri, Dec 26, 2025 at 06:19:14PM -0300, Fabiano Rosas wrote:\n>> Whenever an error occurs between migrate_init() and the start of\n>> migration_thread, do cleanup immediately after.\n>> \n>> This allows the special casing for resume to be removed from\n>> migration_connect(), that check is now done at\n>> migration_connect_error_propagate() which already had a case for\n>> resume.\n>> \n>> Signed-off-by: Fabiano Rosas <farosas@suse.de>\n>\n> Didn't spot anything wrong,\n>\n> Reviewed-by: Peter Xu <peterx@redhat.com>\n>\n> One nitpick below,\n>\n>> ---\n>>  migration/migration.c | 42 +++++++++++++++++++++++++++---------------\n>>  1 file changed, 27 insertions(+), 15 deletions(-)\n>> \n>> diff --git a/migration/migration.c b/migration/migration.c\n>> index 0f1644b276..a66b2d7aaf 100644\n>> --- a/migration/migration.c\n>> +++ b/migration/migration.c\n>> @@ -1576,15 +1576,21 @@ static void migration_connect_error_propagate(MigrationState *s, Error *error)\n>>  {\n>>      MigrationStatus current = s->state;\n>>      MigrationStatus next = MIGRATION_STATUS_NONE;\n>> +    bool resume = false;\n>>  \n>>      switch (current) {\n>>      case MIGRATION_STATUS_SETUP:\n>>          next = MIGRATION_STATUS_FAILED;\n>>          break;\n>>  \n>> +    case MIGRATION_STATUS_POSTCOPY_PAUSED:\n>> +        resume = true;\n>> +        break;\n>> +\n>>      case MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP:\n>>          /* Never fail a postcopy migration; switch back to PAUSED instead */\n>>          next = MIGRATION_STATUS_POSTCOPY_PAUSED;\n>> +        resume = true;\n>>          break;\n>>  \n>>      case MIGRATION_STATUS_CANCELLING:\n>> @@ -1609,6 +1615,10 @@ static void migration_connect_error_propagate(MigrationState *s, Error *error)\n>>      }\n>>  \n>>      migrate_error_propagate(s, error);\n>> +\n>> +    if (!resume) {\n>> +        migration_cleanup(s);\n>> +    }\n>>  }\n>>  \n>>  void migration_cancel(void)\n>> @@ -2209,12 +2219,19 @@ static gboolean qmp_migrate_finish_cb(QIOChannel *channel,\n>>                                        GIOCondition cond,\n>>                                        void *opaque)\n>>  {\n>> +    MigrationState *s = migrate_get_current();\n>>      MigrationAddress *addr = opaque;\n>> +    Error *local_err = NULL;\n>> +\n>> +    qmp_migrate_finish(addr, &local_err);\n>> +\n>> +    if (local_err) {\n>> +        migration_connect_error_propagate(s, local_err);\n>> +    }\n>>  \n>> -    qmp_migrate_finish(addr, NULL);\n>>  \n>>      cpr_state_close();\n>> -    migrate_hup_delete(migrate_get_current());\n>> +    migrate_hup_delete(s);\n>\n> IMHO we should drop these two lines.  For error cases, now they'll be done\n> in migration_cleanup() above.  Actually for success, it's the same, but in\n> the cleanup BH.\n>\n\nHmm that would be good, I'll look into it.\n\n> Maybe there're other cases where we can clean the code a bit on cpr;\n> there're codes that always does \"if (xxx)\" and calling them all over the\n> places, so it's easy to write such code when drafting a feature, but hard\n> to maintain, because it'll be obscure when it'll really trigger, like this\n> one.  We can leave the rest for later if there're applicable similar\n> cleanups.\n>\n>>      qapi_free_MigrationAddress(addr);\n>>      return G_SOURCE_REMOVE;\n>>  }\n>> @@ -2223,7 +2240,6 @@ void qmp_migrate(const char *uri, bool has_channels,\n>>                   MigrationChannelList *channels, bool has_detach, bool detach,\n>>                   bool has_resume, bool resume, Error **errp)\n>>  {\n>> -    Error *local_err = NULL;\n>>      MigrationState *s = migrate_get_current();\n>>      g_autoptr(MigrationChannel) channel = NULL;\n>>      MigrationAddress *addr = NULL;\n>> @@ -2280,6 +2296,13 @@ void qmp_migrate(const char *uri, bool has_channels,\n>>          return;\n>>      }\n>>  \n>> +    /*\n>> +     * The migrate_prepare() above calls migrate_init(). From this\n>> +     * point on, until the end of migration, make sure any failures\n>> +     * eventually result in a call to migration_cleanup().\n>> +     */\n>> +    Error *local_err = NULL;\n>> +\n>>      if (!cpr_state_save(cpr_channel, &local_err)) {\n>>          goto out;\n>>      }\n>> @@ -2299,12 +2322,11 @@ void qmp_migrate(const char *uri, bool has_channels,\n>>                          QAPI_CLONE(MigrationAddress, addr));\n>>  \n>>      } else {\n>> -        qmp_migrate_finish(addr, errp);\n>> +        qmp_migrate_finish(addr, &local_err);\n>>      }\n>>  \n>>  out:\n>>      if (local_err) {\n>> -        yank_unregister_instance(MIGRATION_YANK_INSTANCE);\n>>          migration_connect_error_propagate(s, error_copy(local_err));\n>>          error_propagate(errp, local_err);\n>>      }\n>> @@ -2335,12 +2357,6 @@ static void qmp_migrate_finish(MigrationAddress *addr, Error **errp)\n>>      } else {\n>>          error_setg(&local_err, \"uri is not a valid migration protocol\");\n>>      }\n>> -\n>> -    if (local_err) {\n>> -        migration_connect_error_propagate(s, error_copy(local_err));\n>> -        error_propagate(errp, local_err);\n>> -        return;\n>> -    }\n>>  }\n>>  \n>>  void qmp_migrate_cancel(Error **errp)\n>> @@ -4027,9 +4043,6 @@ void migration_connect(MigrationState *s, Error *error_in)\n>>      s->expected_downtime = migrate_downtime_limit();\n>>      if (error_in) {\n>>          migration_connect_error_propagate(s, error_in);\n>> -        if (!resume) {\n>> -            migration_cleanup(s);\n>> -        }\n>>          if (s->error) {\n>>              error_report_err(error_copy(s->error));\n>>          }\n>> @@ -4108,7 +4121,6 @@ void migration_connect(MigrationState *s, Error *error_in)\n>>  \n>>  fail:\n>>      migration_connect_error_propagate(s, local_err);\n>> -    migration_cleanup(s);\n>>      if (s->error) {\n>>          error_report_err(error_copy(s->error));\n>>      }\n>> -- \n>> 2.51.0\n>>","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256\n header.s=susede2_rsa header.b=yhejH3bf;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=2dEtZ46l;\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.a=rsa-sha256 header.s=susede2_rsa header.b=wUGjr5JK;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=maVTMm05;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","smtp-out1.suse.de;\n dkim=pass header.d=suse.de header.s=susede2_rsa header.b=wUGjr5JK;\n dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=maVTMm05"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4dg5p72f2Hz1xpV\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 30 Dec 2025 06:27:27 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vaItS-0006EK-HS; Mon, 29 Dec 2025 14:27:02 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <farosas@suse.de>) id 1vaItP-0006E3-Kj\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 14:26:59 -0500","from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <farosas@suse.de>) id 1vaItN-0005uI-So\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 14:26:59 -0500","from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org\n [IPv6:2a07:de40:b281:104:10:150:64:97])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-out1.suse.de (Postfix) with ESMTPS id 4C9D3336BA;\n Mon, 29 Dec 2025 19:26:54 +0000 (UTC)","from imap1.dmz-prg2.suse.org (localhost [127.0.0.1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BB742137C3;\n Mon, 29 Dec 2025 19:26:53 +0000 (UTC)","from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167])\n by imap1.dmz-prg2.suse.org with ESMTPSA id r7ZgHv3VUmkZVQAAD6G6ig\n (envelope-from <farosas@suse.de>); Mon, 29 Dec 2025 19:26:53 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1767036415;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:content-type:content-type:\n in-reply-to:in-reply-to:references:references;\n bh=ckehpuBB+5kN5+Vrp9lAj4hTb2uGW+ovExeI0jXMo8o=;\n b=yhejH3bfexVEfcrlPVhm4F2I0No1sf+3HuZAmkNaVL7DpbPaFliw683XSqplqUpkXK2KpL\n YIKqLYeGLjFHlgXqytRTtitDi9O/2lGEolfGXWr7bftWGG5bTwwhSo/tGmw1lw5+jNj/Dd\n bpOX+M1ujjqfEGAW4jvJhtgvumPxwEw=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1767036415;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:content-type:content-type:\n in-reply-to:in-reply-to:references:references;\n bh=ckehpuBB+5kN5+Vrp9lAj4hTb2uGW+ovExeI0jXMo8o=;\n b=2dEtZ46lOEgeWIPYRWrVy1cQq20CHK/gVIQ0lhosKYcO0P2epjW6Rr5XFSGfcoSVxcCvOD\n IuYv6k+WeLZ9fPDw==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1767036414;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:content-type:content-type:\n in-reply-to:in-reply-to:references:references;\n bh=ckehpuBB+5kN5+Vrp9lAj4hTb2uGW+ovExeI0jXMo8o=;\n b=wUGjr5JKCjbBXngi5/RKtVRa1yKbvM/4PA8RNeW/ITjF9zOoE9NliiiZiK5O+CY/6MmUIJ\n Z3pwJozOWopO6iiuOptGe4TNJfsSRDaAWOiWxXgpM6bLipb3gN5A07z914Z9g80rWzWbJv\n xeqpSKoCN5rJBR8g9SHiFcfLSChRqY4=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1767036414;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:content-type:content-type:\n in-reply-to:in-reply-to:references:references;\n bh=ckehpuBB+5kN5+Vrp9lAj4hTb2uGW+ovExeI0jXMo8o=;\n b=maVTMm057icGSg6TPbo2cj/ChB+yeEgnSBBuHFn+IdUlLc8CC4V8w5GRWmf/wSiAiJNNtq\n d2eyeTV2n7gWdZAA=="],"From":"Fabiano Rosas <farosas@suse.de>","To":"Peter Xu <peterx@redhat.com>","Cc":"qemu-devel@nongnu.org","Subject":"Re: [RFC PATCH 12/25] migration: Fold migration_cleanup() into\n migration_connect_error_propagate()","In-Reply-To":"<aVLLeZQm376POJ0t@x1.local>","References":"<20251226211930.27565-1-farosas@suse.de>\n <20251226211930.27565-13-farosas@suse.de> <aVLLeZQm376POJ0t@x1.local>","Date":"Mon, 29 Dec 2025 16:26:50 -0300","Message-ID":"<87ikdp84xx.fsf@suse.de>","MIME-Version":"1.0","Content-Type":"text/plain","X-Spam-Score":"-4.51","X-Rspamd-Queue-Id":"4C9D3336BA","X-Spamd-Result":"default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%];\n NEURAL_HAM_LONG(-1.00)[-1.000];\n R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain];\n MX_GOOD(-0.01)[]; FUZZY_RATELIMITED(0.00)[rspamd.com];\n RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[];\n RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[];\n MIME_TRACE(0.00)[0:+]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim];\n MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2];\n RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[];\n FROM_HAS_DN(0.00)[];\n SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from];\n DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:dkim,suse.de:email];\n DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received];\n TO_MATCH_ENVRCPT_ALL(0.00)[];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n DKIM_TRACE(0.00)[suse.de:+]","X-Rspamd-Server":"rspamd1.dmz-prg2.suse.org","X-Rspamd-Action":"no action","Received-SPF":"pass client-ip=2a07:de40:b251:101:10:150:64:1;\n envelope-from=farosas@suse.de; helo=smtp-out1.suse.de","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"}}]