From nobody Sat Apr 5 02:20:49 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1739292025; cv=none; d=zohomail.com; s=zohoarc; b=Yox+DTErv/fYXrxtjXT9ulsuIAjawN2A1YGbsrSpFvQVY6ouKwD9Ch91xpjSyRSvlXRZX4/ASdLLZssdRxVoANikk8Z0vvNklzOT80QeMC5DVXF+WXuER308eMKf6dYdJROkU2mDKPIKBhgScohO9gFzxTRpZQEhTHIIYa2Fjw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739292025; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=w6zyp1OJxPRBDtAMlQSuXOqySwtjEkwC0rRKYi096zg=; b=C084d8omtDEyPoq2bJhOBUfICp6hFAkj9vF61YUiDCXUSUOgejNxyOVBOq3WBy8Cy5pb3r3NAIUkCCd/hovg9LEXIGmhZrNEQAC9+ZKlQbZ3Bo+iDctooIP7ueVUG6PHEQjWtIJMK3sHJ53MJNGn1duIN5Rk8BU/3252P4qR6iE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739292025037485.3346180887071; Tue, 11 Feb 2025 08:40:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thtGv-00034M-4F; Tue, 11 Feb 2025 11:38:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thtG7-0002IT-GK for qemu-devel@nongnu.org; Tue, 11 Feb 2025 11:37:17 -0500 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thtG5-0008TD-4b for qemu-devel@nongnu.org; Tue, 11 Feb 2025 11:37:15 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D02F137C1A; Tue, 11 Feb 2025 15:01:51 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 88F6A13715; Tue, 11 Feb 2025 15:01:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id KM6wEl5mq2c8WwAAD6G6ig (envelope-from ); Tue, 11 Feb 2025 15:01:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739286111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w6zyp1OJxPRBDtAMlQSuXOqySwtjEkwC0rRKYi096zg=; b=ZX5qYRm1FS/wF77KYd2YcDfoXj532gMAhocbSMxu5NWtNkXcrr3rxyFhbUoDx2knYbntIy XXnFkHTIfWSDYWn6r/YHBYOVI9iPtkWnjkmppFKZAk9Mh3nS5sVc+YkpMXMPphZDg7Yl+b 7mXPXNTzNuWs3B5Ue6H/oMMC78swymw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739286111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w6zyp1OJxPRBDtAMlQSuXOqySwtjEkwC0rRKYi096zg=; b=dV9G/r0vgec8eW6FCNHYeiUfi9i/sufHxKStpADFIjqKCdE9A0ldxFwSncWhjTi7498wp0 wJ05/p78tWw69dAA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ZX5qYRm1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="dV9G/r0v" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739286111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w6zyp1OJxPRBDtAMlQSuXOqySwtjEkwC0rRKYi096zg=; b=ZX5qYRm1FS/wF77KYd2YcDfoXj532gMAhocbSMxu5NWtNkXcrr3rxyFhbUoDx2knYbntIy XXnFkHTIfWSDYWn6r/YHBYOVI9iPtkWnjkmppFKZAk9Mh3nS5sVc+YkpMXMPphZDg7Yl+b 7mXPXNTzNuWs3B5Ue6H/oMMC78swymw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739286111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w6zyp1OJxPRBDtAMlQSuXOqySwtjEkwC0rRKYi096zg=; b=dV9G/r0vgec8eW6FCNHYeiUfi9i/sufHxKStpADFIjqKCdE9A0ldxFwSncWhjTi7498wp0 wJ05/p78tWw69dAA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 6/9] migration: Don't set FAILED state when cancelling Date: Tue, 11 Feb 2025 12:01:33 -0300 Message-Id: <20250211150136.6781-7-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250211150136.6781-1-farosas@suse.de> References: <20250211150136.6781-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: D02F137C1A X-Spamd-Result: default: False [-3.00 / 50.00]; BAYES_HAM(-2.99)[99.97%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:email,suse.de:dkim,suse.de:mid]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.00 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:1; 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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1739292026293019000 Content-Type: text/plain; charset="utf-8" It's possible that the migration is cancelled during migration_switchover_start(). In that case, don't set the migration state FAILED in migration_completion(). Fixes: 3dde8fdbad ("migration: Merge precopy/postcopy on switchover start") Signed-off-by: Fabiano Rosas --- migration/migration.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 375de6d460..5dc43bcdc0 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2986,7 +2986,9 @@ fail: error_free(local_err); } =20 - migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); + if (s->state !=3D MIGRATION_STATUS_CANCELLING) { + migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); + } } =20 /** --=20 2.35.3