From nobody Tue Feb 10 12:57:54 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=1684341314; cv=none; d=zohomail.com; s=zohoarc; b=lO75ZyAaBfa6nki1lLMvSJoJ/Gtx3K3DBVR8KBfvnMx6qc9FhBtoCDB/Oq69meYWAHkmAjsbArjiLUEEcUWc/b9dbHBH6xtkr3yxt3DvWzv05J4MXRwoAOaTXVd739DLA7yN+BiVLUwgHF+iQ/RKOVxFrlZWKC9IHV0aJ2NI3Go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684341314; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tg5ghrFH8r7Mc8ogtoJinO/XybdKcGC7SSuNZBGyTdg=; b=EvWBJYV5+D5yvRbTRLZRJtX9x9955PFjKv8h8z+PKT1KhxGpXiJadotx+UZsLeIdGo8Ur86b5wgIGQ5wwe6mR9vK3hcAvB2QR0FfzDKUdfZnVFnjcCao4BRH+E5tGXK3d2mrWb0NYiiDWItVPkpomOMqSc0g4MhFoFtCsCwpPmU= 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 16843413148311016.6277790409115; Wed, 17 May 2023 09:35:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzK6Q-0004AU-6V; Wed, 17 May 2023 12:34:14 -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 1pzK6O-0004AI-PX for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:12 -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 1pzK6N-0005yp-9q for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:12 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-295-e9YFCTvPOISu67AWembI0g-1; Wed, 17 May 2023 12:34:08 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C63D3805F61; Wed, 17 May 2023 16:34:07 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C7D62166B31; Wed, 17 May 2023 16:34:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684341250; 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=tg5ghrFH8r7Mc8ogtoJinO/XybdKcGC7SSuNZBGyTdg=; b=SUJ9np3hyZBK7jf//9rON5bg4clQDjkgVXUuaUCRXujtBgAi8KyT2e6GmQOaoQxXpLyq9v vBuza/pmSsks6OiHPGfyZCptZFgV0LxbfGpUOlFHOO0cBXLWZJK4kurPPLRL4ybfm9OoaY 5NYTs/QGcT97ydoiqSc4KzJka6fX7ps= X-MC-Unique: e9YFCTvPOISu67AWembI0g-1 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , Vladimir Sementsov-Ogievskiy , Beraldo Leal , Daniel Berrange , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 1/5] python/qmp: allow sockets to be passed to connect() Date: Wed, 17 May 2023 12:34:02 -0400 Message-Id: <20230517163406.2593480-2-jsnow@redhat.com> In-Reply-To: <20230517163406.2593480-1-jsnow@redhat.com> References: <20230517163406.2593480-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.129.124; envelope-from=jsnow@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, 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: 1684341335325100003 Content-Type: text/plain; charset="utf-8" Allow existing sockets to be passed to connect(). The changes are pretty minimal, and this allows for far greater flexibility in setting up communications with an endpoint. Signed-off-by: John Snow --- python/qemu/qmp/protocol.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py index 22e60298d2..d534db4631 100644 --- a/python/qemu/qmp/protocol.py +++ b/python/qemu/qmp/protocol.py @@ -370,7 +370,7 @@ async def accept(self) -> None: =20 @upper_half @require(Runstate.IDLE) - async def connect(self, address: SocketAddrT, + async def connect(self, address: Union[SocketAddrT, socket.socket], ssl: Optional[SSLContext] =3D None) -> None: """ Connect to the server and begin processing message queues. @@ -615,7 +615,7 @@ async def _do_accept(self) -> None: self.logger.debug("Connection accepted.") =20 @upper_half - async def _do_connect(self, address: SocketAddrT, + async def _do_connect(self, address: Union[SocketAddrT, socket.socket], ssl: Optional[SSLContext] =3D None) -> None: """ Acting as the transport client, initiate a connection to a server. @@ -634,9 +634,17 @@ async def _do_connect(self, address: SocketAddrT, # otherwise yield. await asyncio.sleep(0) =20 - self.logger.debug("Connecting to %s ...", address) - - if isinstance(address, tuple): + if isinstance(address, socket.socket): + self.logger.debug("Connecting with existing socket: " + "fd=3D%d, family=3D%r, type=3D%r", + address.fileno(), address.family, address.ty= pe) + connect =3D asyncio.open_connection( + limit=3Dself._limit, + ssl=3Dssl, + sock=3Daddress, + ) + elif isinstance(address, tuple): + self.logger.debug("Connecting to %s ...", address) connect =3D asyncio.open_connection( address[0], address[1], @@ -644,13 +652,14 @@ async def _do_connect(self, address: SocketAddrT, limit=3Dself._limit, ) else: + self.logger.debug("Connecting to file://%s ...", address) connect =3D asyncio.open_unix_connection( path=3Daddress, ssl=3Dssl, limit=3Dself._limit, ) + self._reader, self._writer =3D await connect - self.logger.debug("Connected.") =20 @upper_half --=20 2.40.0