From nobody Sun Jan 25 11:59:41 2026 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=1769178113; cv=none; d=zohomail.com; s=zohoarc; b=GdOR94p/BlmB7ghD5bK5+vhrOczMdsUmVzhonzyjgnp3zUSbLZprTZhfKCosCdl/jxkwtkups9mvzjujNKF05uBYjHRCkdGdURmu7f4vbwR1+rVMRet7aQ+6i0y0cWYTklVC7e7CBw4DoxSYS8jgzHEfC+lq4wlv7MylbqDUQOc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769178113; 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=Xg3nH2VvsYRln5tA8MxnJUSTZ9avJZU4ulARReYGG1A=; b=I4zbkc5PgWUmAS4eCUGAYaTFKLyGe2fXUebbcAI7ZoP1owomXdMw47OugYC2DGPgl+j7V8T0EN9i2RzMFBnBh+JZUGFRHJSdzvFPBm04s9R0xCigov437QjLds90eaANEh7FIkExwVKj3PIDyBRWe35P2a5BOi+5GcynYiee1ps= 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 1769178113597789.8478430290942; Fri, 23 Jan 2026 06:21:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vjHzc-0002An-4b; Fri, 23 Jan 2026 09:18:32 -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 1vjHzX-0001VE-Di for qemu-devel@nongnu.org; Fri, 23 Jan 2026 09:18:27 -0500 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vjHzV-0003lY-P9 for qemu-devel@nongnu.org; Fri, 23 Jan 2026 09:18:27 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [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 B30A133815; Fri, 23 Jan 2026 14:17:59 +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 DB0531395E; Fri, 23 Jan 2026 14:17:57 +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 MLycJhWDc2m8HAAAD6G6ig (envelope-from ); Fri, 23 Jan 2026 14:17:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769177879; 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=Xg3nH2VvsYRln5tA8MxnJUSTZ9avJZU4ulARReYGG1A=; b=XTRYjMjdrdIZhLFCBAQ0dBiHxnnR4g2jLgFOUrX8gtJMvf1tdeUfRAwNVRU/i9rrqc3D79 j/tjglOi9qamreUZF80E2ZxE34I5BIgTv+NAuY470OCWDuTtcYTD2VkSEq4VOpHEceCrXN ddYM8MOR66VyoLoJo3NSgJBia3EFTT8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769177879; 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=Xg3nH2VvsYRln5tA8MxnJUSTZ9avJZU4ulARReYGG1A=; b=t9UOpgAHmOpQJdBqE9V3uc9pVbt2fV2vw3Ehp9vHGqUSc3STEo8VvkUtE5d+A37WVNFUX0 MYJHzHAzmX1CSxCQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769177879; 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=Xg3nH2VvsYRln5tA8MxnJUSTZ9avJZU4ulARReYGG1A=; b=XTRYjMjdrdIZhLFCBAQ0dBiHxnnR4g2jLgFOUrX8gtJMvf1tdeUfRAwNVRU/i9rrqc3D79 j/tjglOi9qamreUZF80E2ZxE34I5BIgTv+NAuY470OCWDuTtcYTD2VkSEq4VOpHEceCrXN ddYM8MOR66VyoLoJo3NSgJBia3EFTT8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769177879; 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=Xg3nH2VvsYRln5tA8MxnJUSTZ9avJZU4ulARReYGG1A=; b=t9UOpgAHmOpQJdBqE9V3uc9pVbt2fV2vw3Ehp9vHGqUSc3STEo8VvkUtE5d+A37WVNFUX0 MYJHzHAzmX1CSxCQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: peterx@redhat.com, berrange@redhat.com, ppandit@redhat.com, Prasad Pandit Subject: [PATCH v4 24/25] migration: Remove qmp_migrate_finish Date: Fri, 23 Jan 2026 11:16:54 -0300 Message-ID: <20260123141656.6765-25-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260123141656.6765-1-farosas@suse.de> References: <20260123141656.6765-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,fedoraproject.org:email,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: qemu development 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: 1769178117329154100 Content-Type: text/plain; charset="utf-8" After cleanups, the qmp_migrate_finish function is now just a call to migration_connect_outgoing(). Remove qmp_migrate_finish() and rename the qmp_migrate_finish_cb callback. This also allows the function's error handling to be removed as it now receives &local_err like the rest of the callees of qmp_migrate(). Reviewed-by: Peter Xu Reviewed-by: Prasad Pandit Signed-off-by: Fabiano Rosas --- migration/migration.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index eb755ac59c..7086c9e1d2 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1999,15 +1999,18 @@ static bool migrate_prepare(MigrationState *s, bool= resume, Error **errp) return true; } =20 -static void qmp_migrate_finish(MigrationAddress *addr, Error **errp); - -static gboolean qmp_migrate_finish_cb(QIOChannel *channel, - GIOCondition cond, - void *opaque) +static gboolean migration_connect_outgoing_cb(QIOChannel *channel, + GIOCondition cond, void *opa= que) { - MigrationAddress *addr =3D opaque; + MigrationState *s =3D migrate_get_current(); + Error *local_err =3D NULL; + + migration_connect_outgoing(s, opaque, &local_err); + + if (local_err) { + migration_connect_error_propagate(s, local_err); + } =20 - qmp_migrate_finish(addr, NULL); return G_SOURCE_REMOVE; } =20 @@ -2056,10 +2059,11 @@ void qmp_migrate(const char *uri, bool has_channels, * connection, so qmp_migrate_finish will fail to connect, and then re= cover. */ if (migrate_mode() =3D=3D MIG_MODE_CPR_TRANSFER) { - cpr_transfer_add_hup_watch(s, qmp_migrate_finish_cb, main_ch->addr= ); + cpr_transfer_add_hup_watch(s, migration_connect_outgoing_cb, + main_ch->addr); =20 } else { - qmp_migrate_finish(main_ch->addr, errp); + migration_connect_outgoing(s, main_ch->addr, &local_err); } =20 out: @@ -2069,19 +2073,6 @@ out: } } =20 -static void qmp_migrate_finish(MigrationAddress *addr, Error **errp) -{ - MigrationState *s =3D migrate_get_current(); - Error *local_err =3D NULL; - - migration_connect_outgoing(s, addr, &local_err); - - if (local_err) { - migration_connect_error_propagate(s, error_copy(local_err)); - error_propagate(errp, local_err); - } -} - void qmp_migrate_cancel(Error **errp) { /* --=20 2.51.0