From nobody Mon Feb 9 20:11:34 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=1685565852; cv=none; d=zohomail.com; s=zohoarc; b=YMeWGWpCDeaUwYtGiOfYX+lzmQAQnlg5ZJfQ8ydjQ5p7ypmi7fl6CAHIrKX9PDhCdLDpsugW5YE9aMIQrpXPSLWylDcwrEhEypOtgEObFX7RrsL3i5RIsnkAlf77iXRFs6iKxW5j+g3FK97vTzYUkMtITKpjFaX9eona0hRhwEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565852; 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=mZcGayvwUM1HGQBT6wPG68afCyKhTqRWG5bfnWhNbMY=; b=WxBP2O8NgK1BCcN5KeKSWF61NmMMopo0Ey9oHVCC1ttglNjPWiaR6EHrOkyYfoGgg36U6pkycGApAU3rOavXNe5NOfK74qSZalcXIOq725o6c+UbYuoJRYjkIw9Crc/fyskyZcN3DwQZNBxNQ2NBC/ulKqG8i/KlDPxHKEss40U= 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 1685565852960879.5984922477666; Wed, 31 May 2023 13:44:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4Sfk-0005y4-MT; Wed, 31 May 2023 16:43:56 -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 1q4Sfh-0005sZ-Bi for qemu-devel@nongnu.org; Wed, 31 May 2023 16:43:53 -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 1q4SfY-0004th-VF for qemu-devel@nongnu.org; Wed, 31 May 2023 16:43:53 -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-672-85Ll0ROEPJyhq20iz0C-ZQ-1; Wed, 31 May 2023 16:43:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C738101A531; Wed, 31 May 2023 20:43:40 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id B26272029F6D; Wed, 31 May 2023 20:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685565824; 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=mZcGayvwUM1HGQBT6wPG68afCyKhTqRWG5bfnWhNbMY=; b=JlUpqO68SAbK5KPlpFcKcJLeQPxTNLicBqXkqND5xREJYUkv8Er7Ut/4HAB4WhhiXhwLCZ uwJIupJwfCayj5mhKxHLlsfcR1J6hPsSFbp5UYKygZ/RSj47WbWWTOKBVgEzwHPvdoypnK FBxXZNLu4WJJgQfVTQ58rU3TJPFQorQ= X-MC-Unique: 85Ll0ROEPJyhq20iz0C-ZQ-1 From: John Snow To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Beraldo Leal , Hanna Reitz , Markus Armbruster , Peter Maydell , qemu-block@nongnu.org, Kevin Wolf , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PULL 1/5] python/qmp: allow sockets to be passed to connect() Date: Wed, 31 May 2023 16:43:34 -0400 Message-Id: <20230531204338.1656158-2-jsnow@redhat.com> In-Reply-To: <20230531204338.1656158-1-jsnow@redhat.com> References: <20230531204338.1656158-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.163, 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=unavailable 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: 1685565855011100003 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 Message-id: 20230517163406.2593480-2-jsnow@redhat.com 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.1