From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6983C71136 for ; Thu, 12 Jun 2025 13:42:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uPiBX-0004bz-DO; Thu, 12 Jun 2025 09:41:39 -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 1uPiBQ-0004bf-LB for qemu-devel@nongnu.org; Thu, 12 Jun 2025 09:41:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uPiBM-0000X0-Vu for qemu-devel@nongnu.org; Thu, 12 Jun 2025 09:41:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749735687; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=/6nhs55HeCEfop4HhUcD3CdGhQXBSPU2ZhHHxwdY5Rs=; b=WYtjKsGFlk5LG723yCzLtHp0HWaZC5vz8Llk3N473jGMx7lnUztJ0ghYRPz5tCgu/eMlmn cuDnF9HXyJcgWwk4U649U/YfqFZh56rio3FltcRkUlxS5ACGuktwhy65AmPCRbBRQmQOLW hK4Je6788p5IYvq1y9AmuC5KzM43LLk= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-QMw2CSZANOOWU_7jTfk1TQ-1; Thu, 12 Jun 2025 09:41:23 -0400 X-MC-Unique: QMw2CSZANOOWU_7jTfk1TQ-1 X-Mimecast-MFC-AGG-ID: QMw2CSZANOOWU_7jTfk1TQ_1749735682 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AD694180AE16; Thu, 12 Jun 2025 13:41:22 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.113]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9DC9E195E340; Thu, 12 Jun 2025 13:41:19 +0000 (UTC) Date: Thu, 12 Jun 2025 14:41:15 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Jaehoon Kim Cc: qemu-devel@nongnu.org, jjherne@linux.ibm.com, steven.sistare@oracle.com, peterx@redhat.com, farosas@suse.de, lvivier@redhat.com, pbonzini@redhat.com Subject: Re: [PATCH v4 2/2] migration: Support fd-based socket address in cpr_transfer_input Message-ID: References: <20250611205610.147008-1-jhkim@linux.ibm.com> <20250611205610.147008-3-jhkim@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250611205610.147008-3-jhkim@linux.ibm.com> User-Agent: Mutt/2.2.14 (2025-02-20) X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, Jun 11, 2025 at 03:56:10PM -0500, Jaehoon Kim wrote: > 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 > --- > migration/cpr-transfer.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) This patch *MUST* be first in the series, otherwise 'git bisect' will hit test failures on the former patch. > > 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, Error **errp) > MigrationAddress *addr = channel->addr; > > if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET && > - addr->u.socket.type == SOCKET_ADDRESS_TYPE_UNIX) { > + (addr->u.socket.type == SOCKET_ADDRESS_TYPE_UNIX || > + addr->u.socket.type == SOCKET_ADDRESS_TYPE_FD)) { > > g_autoptr(QIOChannelSocket) sioc = NULL; > SocketAddress *saddr = &addr->u.socket; > @@ -60,7 +61,9 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) > > sioc = qio_net_listener_wait_client(listener); > ioc = QIO_CHANNEL(sioc); > - trace_cpr_transfer_input(addr->u.socket.u.q_unix.path); > + trace_cpr_transfer_input( > + addr->u.socket.type == 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); > > -- > 2.49.0 > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|