From nobody Sat Nov 15 15:29:50 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1750709365; cv=none; d=zohomail.com; s=zohoarc; b=ac7mqZErEra90F3YibVkmuhrvfStU6K63g/hF+0eVjG2AofGBN9PYzGvnGeXXj2E62Tyd53kQo/trI1eEjLFmbon1RNHe8AFaX3cXjmdY9WYnIJGLtYEaLgxH2hTN2n4PFOp7uI3FmENRrtoSuXXfbxpJjpN2mmQoW2AGyBCWnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750709365; 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=gkEJjraRCepMoGaVxmMxS16KxsRSxOPvQtdhhkypr5k=; b=cfPY3PPBEABKwPuPguNwsQLg4QsAWrrqPEgQh3uS9PhVSsVIqy/TDsp/BH3+e25PXAdJ3m7WKn8ne7eOlwgwYPMCb3Xo3Ez3iN48YH+B+5Pd2f6HGddG2zwaWBPeEMtJkD7bAjF7pZJHKuUs6u32TdRNeqEiiJq1hbvmnYsgDts= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750709365396443.82037659219657; Mon, 23 Jun 2025 13:09:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTnRh-0005zV-I0; Mon, 23 Jun 2025 16:07:13 -0400 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 1uTnRf-0005zD-Rq for qemu-devel@nongnu.org; Mon, 23 Jun 2025 16:07:11 -0400 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 1uTnRe-0003VJ-8z for qemu-devel@nongnu.org; Mon, 23 Jun 2025 16:07:11 -0400 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-93JwXokYP1-sRec5D-kNkw-1; Mon, 23 Jun 2025 16:07:07 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7ceb5b5140eso683163485a.2 for ; Mon, 23 Jun 2025 13:07:07 -0700 (PDT) Received: from x1.com ([85.131.185.92]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6fd095a775bsm48427976d6.112.2025.06.23.13.07.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 13:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750709228; 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=gkEJjraRCepMoGaVxmMxS16KxsRSxOPvQtdhhkypr5k=; b=TXRVAtUhm7pcL0ATaICTwuAGxeGMQ/aNwT2Q78RgZSPsO/K/B+DGnytVryyy6bPMwLY8ge 54i7xp85atSRBrHp7+HyXzvjbvyCSROyItCUBDfMsB25QFNXy7bwulpT33tYJHm6CjtFna orVqeHKIvBcKmdCWm4lF2+Xh4uQZhAA= X-MC-Unique: 93JwXokYP1-sRec5D-kNkw-1 X-Mimecast-MFC-AGG-ID: 93JwXokYP1-sRec5D-kNkw_1750709227 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750709226; x=1751314026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gkEJjraRCepMoGaVxmMxS16KxsRSxOPvQtdhhkypr5k=; b=JH582AZdZrcHtr1gKIXyVuXbLZMZl7Valus3FinlJuVlOiWKPsWiZePjkVjDFMOgTx K1QiEA2v6ry/xT45zYXsC9/gQJxSIAXe7R6rRaX0JVCqVDsz3aHIzznNe9ebcBxqk8iu 81ueAmnu8xQtU/0/g1Nfn5yFI1rwljXWh7wPZbl7s0R+ek5ydveOU7Lsz2xKe38hb0po U1D7p9YlWdNaEyRZhv3uwDonmRCXQGSelkQCxm5UmabHHkUjex+6DDVD1L64vSvh9wug H6a6xlWamwOyleO+YqLBZrLgUrEtW0GI66mdcg47SCveAzfTQAVj3vWq32wvoR1dnnwc gCvg== X-Gm-Message-State: AOJu0YxMtS7aF9vdMxVqE1xa5ejAvngpjdYAvNtpAGqtK8JV2ffQfTwh lSnapwi5kVKkfV9NxyL6GMHmRODi2f95RRBXCTIz371FymqZvH3cxlTb2FZ5/AEpqfLLqvvJ03M hjFO7Ud6UmsdlsTCFhgILeithDNVFeMz0zZP4r4K6oZTWxBbx+fQjpUJujNQ2lRpANzcxEZTNyL 6nbU69rzFJbD/NNTeT/g7arTsDig5MuVrBw3rAfw== X-Gm-Gg: ASbGncsY4hplJf0BqXqn6mn3FjS5wp0xdiPlc6aDOZHdzFPKkxW8q2tCtoS0J7FshuL RWdx0cuDlxcdjsg+Iea9Y1GR9i0NwLPO1ganc2RZt8wYb8HPTNnZM025XnJQf8obWxkO5lOk57z gvHizn4adBfth6M6nWgPY+zgquEEzhRqI44pDZN2+OuHX8hRJhhAmut+O5PpciGbTcdRUkYVrTO nLKVWzsAnGAFbVoKBggdbAugS8uXx/bW1G9zpp8IbA8mHR5uS9WnGJpmM1OCfsy5KShX3pZT3d/ hQRb+uV9Jx8= X-Received: by 2002:a05:620a:171e:b0:7c5:49b7:237c with SMTP id af79cd13be357-7d3f992402cmr2069795185a.27.1750709226528; Mon, 23 Jun 2025 13:07:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTfKa1IUadawlTW9uDTrfarIxoxeLKBJksU2SOYhPutnFjX7X0hdq7KO189bVVUHJm3J65ew== X-Received: by 2002:a05:620a:171e:b0:7c5:49b7:237c with SMTP id af79cd13be357-7d3f992402cmr2069790685a.27.1750709226028; Mon, 23 Jun 2025 13:07:06 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: peterx@redhat.com, Fabiano Rosas , Paolo Bonzini , David Hildenbrand , Jaehoon Kim , "Jason J. Herne" , Steve Sistare Subject: [PULL 04/11] migration: Support fd-based socket address in cpr_transfer_input Date: Mon, 23 Jun 2025 16:06:49 -0400 Message-ID: <20250623200656.1882674-5-peterx@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623200656.1882674-1-peterx@redhat.com> References: <20250623200656.1882674-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: -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, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: 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: 1750709365993116600 Content-Type: text/plain; charset="utf-8" From: Jaehoon Kim Extend cpr_transfer_input to handle SOCKET_ADDRESS_TYPE_FD alongside SOCKET_ADDRESS_TYPE_UNIX. This change supports the use of pre-listened socket file descriptors for cpr migration channels. This change is particularly useful in qtest environments, where the socket may be created externally and passed via fd. Reviewed-by: Jason J. Herne Reviewed-by: Steve Sistare Signed-off-by: Jaehoon Kim Link: https://lore.kernel.org/r/20250611205610.147008-3-jhkim@linux.ibm.com Signed-off-by: Peter Xu --- migration/cpr-transfer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/migration/cpr-transfer.c b/migration/cpr-transfer.c index e1f140359c..00371d17c3 100644 --- a/migration/cpr-transfer.c +++ b/migration/cpr-transfer.c @@ -46,7 +46,8 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, E= rror **errp) MigrationAddress *addr =3D channel->addr; =20 if (addr->transport =3D=3D MIGRATION_ADDRESS_TYPE_SOCKET && - addr->u.socket.type =3D=3D SOCKET_ADDRESS_TYPE_UNIX) { + (addr->u.socket.type =3D=3D SOCKET_ADDRESS_TYPE_UNIX || + addr->u.socket.type =3D=3D SOCKET_ADDRESS_TYPE_FD)) { =20 g_autoptr(QIOChannelSocket) sioc =3D NULL; SocketAddress *saddr =3D &addr->u.socket; @@ -60,7 +61,9 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, E= rror **errp) =20 sioc =3D qio_net_listener_wait_client(listener); ioc =3D QIO_CHANNEL(sioc); - trace_cpr_transfer_input(addr->u.socket.u.q_unix.path); + trace_cpr_transfer_input( + addr->u.socket.type =3D=3D SOCKET_ADDRESS_TYPE_UNIX ? + addr->u.socket.u.q_unix.path : addr->u.socket.u.fd.str); qio_channel_set_name(ioc, "cpr-in"); return qemu_file_new_input(ioc); =20 --=20 2.49.0