From nobody Sat Feb 7 05:49:11 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709097368; cv=none; d=zohomail.com; s=zohoarc; b=OCtWwA9VFHNarUoQs8yIgzi9q0np82oOZmOUwvglmsPgTGWcqdULqFsZ3hFzkK1c8gseUoLNogWIA/8gVpUv6hYWtHn01p8TXVxqK0ZBL0lBemd08I7OMSYzmJDV+NFIbJm83V2OuZ+WsjYU2OIop/p3X4XcvbTFiOfxFy2qTTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709097368; 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=mfy7kxCg3orBGddHhphJ6WF0fxLiKSCCVijlA5ohHsM=; b=nIjFNaeu5AvFVrwi0OuwjkQM3kbyDWynPWZ67Qplqv1CMkU+d+5P/Y/1AHYX1yf0ucjhYQVd0ICS2qvdiErm+KY2EQUfAXVwfrrLMRoWRd4+ZF84XEPQ8Dr2YrCaF/hKO2BZPUvcqYZ2e9J17m8flgiegxM17gOxGx8Hj7DGTwY= 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 1709097367998907.7083209900044; Tue, 27 Feb 2024 21:16:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfCHJ-0006ce-3r; Wed, 28 Feb 2024 00:14:49 -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 1rfCHH-0006Z3-IC for qemu-devel@nongnu.org; Wed, 28 Feb 2024 00:14:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfCH5-0006d0-Qu for qemu-devel@nongnu.org; Wed, 28 Feb 2024 00:14:47 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-xsJrgnSlPl2VmFw8hneq9A-1; Wed, 28 Feb 2024 00:14:30 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7946138212C6; Wed, 28 Feb 2024 05:14:30 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BEEF1C060AF; Wed, 28 Feb 2024 05:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709097274; h=from:from:reply-to:subject:subject: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=mfy7kxCg3orBGddHhphJ6WF0fxLiKSCCVijlA5ohHsM=; b=hX7Fu/sc7Zkk4alaqXlOtbheyQhACNPFShmjb4eYxOHcvVMsNsgFEhcbW+5/VyADhunt3d J9/v2UdmXP4LCgrct0BSqVbkw5nlTzn/yRfdtbTWQj02PjK9q15fdz5u7lbrpSyTye7GR0 8RX1OLG/cx7wHSX5yh3FAQAPT2AyUZE= X-MC-Unique: xsJrgnSlPl2VmFw8hneq9A-1 From: peterx@redhat.com To: Peter Maydell , qemu-devel@nongnu.org Cc: David Hildenbrand , Eric Blake , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Fabiano Rosas , "Michael S. Tsirkin" , Thomas Huth , Jason Wang , Alex Williamson , Peter Xu Subject: [PULL 07/25] migration/multifd: Drop registered_yank Date: Wed, 28 Feb 2024 13:12:57 +0800 Message-ID: <20240228051315.400759-8-peterx@redhat.com> In-Reply-To: <20240228051315.400759-1-peterx@redhat.com> References: <20240228051315.400759-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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=170.10.133.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @redhat.com) X-ZM-MESSAGEID: 1709097369257100001 Content-Type: text/plain; charset="utf-8" From: Peter Xu With a clear definition of p->c protocol, where we only set it up if the channel is fully established (TLS or non-TLS), registered_yank boolean will have equal meaning of "p->c !=3D NULL". Drop registered_yank by checking p->c instead. Reviewed-by: Fabiano Rosas Link: https://lore.kernel.org/r/20240222095301.171137-3-peterx@redhat.com Signed-off-by: Peter Xu --- migration/multifd.h | 2 -- migration/multifd.c | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 8a1cad0996..b3fe27ae93 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -78,8 +78,6 @@ typedef struct { bool tls_thread_created; /* communication channel */ QIOChannel *c; - /* is the yank function registered */ - bool registered_yank; /* packet allocated len */ uint32_t packet_len; /* guest page size */ diff --git a/migration/multifd.c b/migration/multifd.c index 84a6b9e58f..1d039a4840 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -666,11 +666,11 @@ static int multifd_send_channel_destroy(QIOChannel *s= end) =20 static bool multifd_send_cleanup_channel(MultiFDSendParams *p, Error **err= p) { - if (p->registered_yank) { + if (p->c) { migration_ioc_unregister_yank(p->c); + multifd_send_channel_destroy(p->c); + p->c =3D NULL; } - multifd_send_channel_destroy(p->c); - p->c =3D NULL; qemu_sem_destroy(&p->sem); qemu_sem_destroy(&p->sem_sync); g_free(p->name); @@ -950,7 +950,6 @@ static bool multifd_channel_connect(MultiFDSendParams *= p, qio_channel_set_delay(ioc, false); =20 migration_ioc_register_yank(ioc); - p->registered_yank =3D true; /* Setup p->c only if the channel is completely setup */ p->c =3D ioc; =20 --=20 2.43.0