{"id":2224698,"url":"http://patchwork.ozlabs.org/api/patches/2224698/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417184742.293061-1-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260417184742.293061-1-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2026-04-17T18:47:42","name":"migration: fix abort when re-migrating after cancel during SETUP","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c3d851d5ebf83f26055b4e9eb219ace51e11670b","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417184742.293061-1-marcandre.lureau@redhat.com/mbox/","series":[{"id":500390,"url":"http://patchwork.ozlabs.org/api/series/500390/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500390","date":"2026-04-17T18:47:42","name":"migration: fix abort when re-migrating after cancel during SETUP","version":1,"mbox":"http://patchwork.ozlabs.org/series/500390/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224698/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224698/checks/","tags":{},"related":[],"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=WsOXOcFy;\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=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.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 4fy3n13mvYz1yD3\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 18 Apr 2026 04:48:35 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wDoEU-0003FR-KW; Fri, 17 Apr 2026 14:48:02 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <marcandre.lureau@redhat.com>)\n id 1wDoEP-0003Eq-Rc\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 14:47:57 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <marcandre.lureau@redhat.com>)\n id 1wDoEO-00064F-BA\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 14:47:57 -0400","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-148-NZslp314MeCAzbGAHeVFvg-1; Fri,\n 17 Apr 2026 14:47:48 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 6AA52180036E; Fri, 17 Apr 2026 18:47:47 +0000 (UTC)","from localhost (unknown [10.44.24.6])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id EDE5A1800351; Fri, 17 Apr 2026 18:47:45 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776451672;\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 content-transfer-encoding:content-transfer-encoding;\n bh=gnjqo+pqbMlz5cqi/ASPMjsRwhbdVbV/bUNHiWq7jek=;\n b=WsOXOcFyFALMmO9xnodUWhn5PhORDoaYdcI7URcmex0cpdKD5d7MdXBSwxy5gd7TXcSVzG\n xV74cVoRNKC93C4jrbnhz6Cuop7SycSpPI7Z8Yk8FtP5QuNPaZd+W5gahOEcQ2eNNGi/m3\n 7B9kC3ZzOMJulNaLpqaimXgKgjDgnZc=","X-MC-Unique":"NZslp314MeCAzbGAHeVFvg-1","X-Mimecast-MFC-AGG-ID":"NZslp314MeCAzbGAHeVFvg_1776451667","From":"marcandre.lureau@redhat.com","To":"qemu-devel@nongnu.org","Cc":"steven.sistare@oracle.com,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>","Subject":"[PATCH] migration: fix abort when re-migrating after cancel during\n SETUP","Date":"Fri, 17 Apr 2026 22:47:42 +0400","Message-ID":"<20260417184742.293061-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","Received-SPF":"pass client-ip=170.10.133.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-25","X-Spam_score":"-2.6","X-Spam_bar":"--","X-Spam_report":"(-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54,\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 development <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"},"content":"From: Marc-André Lureau <marcandre.lureau@redhat.com>\n\nWhen a migration is cancelled during the early SETUP phase (before\nmigration_connect_outgoing() has set s->to_dst_file), migration_cancel()\ntakes a fast path that transitions the state from CANCELLING to\nCancelled without calling migration_cleanup(). This leaves the migration\nyank instance registered.\n\nA subsequent qmp_migrate() call passes the migration_is_running() guard\n(since CANCELLED is a terminal state) and then calls\nyank_register_instance(MIGRATION_YANK_INSTANCE, &error_abort), which\nfinds the stale entry and aborts with \"duplicate yank instance\".\n\n  #6  0x000056028b5e17fc in error_setg_internal\n      (errp=errp@entry=0x56028cc8cb18 <error_abort>, src=src@entry=0x56028ba87fa5 \"../util/yank.c\", line=line@entry=87, func=func@entry=0x56028bb77140 <__func__.5> \"yank_register_instance\", fmt=fmt@entry=0x56028ba87f8d \"duplicate yank instance\") at ../util/error.c:100\n  #7  0x000056028b601b2a in yank_register_instance (instance=instance@entry=0x7ffea0cf36b0, errp=0x56028cc8cb18 <error_abort>) at ../util/yank.c:87\n  #8  0x000056028b25221e in migrate_prepare (s=0x5602b0a7db90, resume=<optimized out>, errp=0x7ffea0cf3718) at ../migration/migration.c:2001\n  #9  qmp_migrate (uri=<optimized out>, has_channels=<optimized out>, channels=<optimized out>, has_resume=<optimized out>, resume=<optimized out>, errp=errp@entry=0x7ffea0cf3718) at ../migration/migration.c:2039\n  #10 0x000056028b5891be in qmp_marshal_migrate (args=<optimized out>, ret=<optimized out>, errp=0x7f63392e0ee0) at qapi/qapi-commands-migration.c:459\n\nAdd missing yank_unregister_instance. Alternatively, it seems\nmigration_cleanup() should be safe in this context too.\n\nFixes: 624e6e654e11 (\"migration: cpr-transfer mode\")\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\n---\n migration/migration.c | 1 +\n 1 file changed, 1 insertion(+)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex 5c9aaa6e58f..bbdd91ee7ee 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -1477,6 +1477,7 @@ void migration_cancel(void)\n                           MIGRATION_STATUS_CANCELLED);\n         cpr_state_close();\n         cpr_transfer_source_destroy(s);\n+        yank_unregister_instance(MIGRATION_YANK_INSTANCE);\n     }\n }\n \n","prefixes":[]}