From nobody Mon Apr 29 18:59:07 2024 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 From nobody Mon Apr 29 18:59:07 2024 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=1685565846; cv=none; d=zohomail.com; s=zohoarc; b=RggcfLn5HCwanbNzQIm8WMRKMgkQ2FbCzNyDlkl2bzdyGYoQQcc0rNmotwaox08+GPqnie9d/RrRA8ayfAlY1UPBCGTA/n1zv7HUIa6j8m2Dj9KiWAlb7rBL1VUY+jHCaTj4ElxER5Kmie9odVap7bPE8dHkWU+uvkqpgwlgrhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565846; 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=vHrxhh25RghyZgOJVCQbCikVFDojRPigsLAB2HuB1JM=; b=dG/xaSB2i7BOrha9noIdKHM8yNo1jypW3ShJI+wQt1lWsWaAHZ8VM9xJpFqAejZlM8kI1qHhD6RRhDYzPjNdGr/ZcaEFeKg+3/FAnmsFDFazgaZnRAxSjL0edb8f75fv2ISFUyNcHiFB3XXl2mTSpE30HEKBKSJBd9oPA5CMNzw= 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 168556584656635.090683857026875; Wed, 31 May 2023 13:44:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4Sfd-0005mu-SY; Wed, 31 May 2023 16:43:49 -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 1q4Sfa-0005mJ-QW for qemu-devel@nongnu.org; Wed, 31 May 2023 16:43:46 -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 1q4SfX-0004tQ-Uo for qemu-devel@nongnu.org; Wed, 31 May 2023 16:43:45 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-27-1TKiyq7NNsS8idaT5wFpRA-1; Wed, 31 May 2023 16:43:41 -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 C710C385556A; 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 48F562029F6D; Wed, 31 May 2023 20:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685565822; 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=vHrxhh25RghyZgOJVCQbCikVFDojRPigsLAB2HuB1JM=; b=L0V+4uLmxQtKQ2ctQlkCqRpUn62bfaaI83h39RKIraFKYeqGB2cZ6JaJvUYdrL4zu9SAXn Ioan42VWrop6aI9uvhkZLvzp4OmYClrTXgCU2GNn8awa0dAsFfQlYVP08w3P2cuo36beg1 W2cEG85JlIHSesq03bGgyK3GhJ+T10I= X-MC-Unique: 1TKiyq7NNsS8idaT5wFpRA-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 2/5] python/qmp/legacy: allow using sockets for connect() Date: Wed, 31 May 2023 16:43:35 -0400 Message-Id: <20230531204338.1656158-3-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.129.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=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: 1685565847838100003 Content-Type: text/plain; charset="utf-8" Instead of asserting that we have an address, allow the use of sockets instead of addresses during a call to connect(). Signed-off-by: John Snow Message-id: 20230517163406.2593480-3-jsnow@redhat.com Signed-off-by: John Snow --- python/qemu/qmp/legacy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py index 8b09ee7dbb..b1eb3f360f 100644 --- a/python/qemu/qmp/legacy.py +++ b/python/qemu/qmp/legacy.py @@ -150,12 +150,13 @@ def connect(self, negotiate: bool =3D True) -> Option= al[QMPMessage]: :return: QMP greeting dict, or None if negotiate is false :raise ConnectError: on connection errors """ - assert self._address is not None + addr_or_sock =3D self._address or self._sock + assert addr_or_sock is not None self._qmp.await_greeting =3D negotiate self._qmp.negotiate =3D negotiate =20 self._sync( - self._qmp.connect(self._address) + self._qmp.connect(addr_or_sock) ) return self._get_greeting() =20 --=20 2.40.1 From nobody Mon Apr 29 18:59:07 2024 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=1685565929; cv=none; d=zohomail.com; s=zohoarc; b=nZTXMASRI+yJl/Q5LjmJba0N5lh+UN2yKJMj1cwKtZTBcorPr2pbjiLhXkTX+vZ9LrN03qFivwBAm2Sg6R/LzW5ew8yJIlMppKs+KC9UjNpECFKsX1jb+OpfqrUtRiggObL+fH2pbo26lnNe+HeiMxF9QbUg2KGdiSqdNTcZhqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565929; 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=/yy1BBiZJor5XxfSqUzZjbxpusCld+EOf+qCIGJEwWA=; b=eOMzvZzAJ2P+qbvoO8ixSDoTVwkE4g5gFvQgoLCfgZh0lTwtwJFT1tYV1J1wE0jyc9H1+rx46NVejDg1EcfpMI7SyjS6b+QR0LEijyUkm8ibVVMDL0kROf6MxtZIFjWenoaZVb6QeOrquOvCOEImryTlaM8H2w9SqFafyVyer1g= 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 16855659292691001.2218080847199; Wed, 31 May 2023 13:45:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4Sfl-00060Q-AM; Wed, 31 May 2023 16:43:57 -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 1q4Sfi-0005wI-3Y for qemu-devel@nongnu.org; Wed, 31 May 2023 16:43:54 -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 1q4Sfa-0004uE-5s 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-269-eGnFS5LfPXWWAqt6DZwz6g-1; Wed, 31 May 2023 16:43:41 -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 5FEAB801182; Wed, 31 May 2023 20:43:41 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3F162029F6D; Wed, 31 May 2023 20:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685565825; 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=/yy1BBiZJor5XxfSqUzZjbxpusCld+EOf+qCIGJEwWA=; b=BTRFgzs8Cqy+ngHvukiNuk9YIv2J3db7bjHH7P8TMAALk05teuV/t2NXp+kavKTGAcNZK2 oR36/avf5DTWeIp9B9Z1DLwajUOKOzAsPcTEHcTBpdrcZSSBzvrpOa3fPu0zbqbMuAvaSx k88KEfEUvs0bfc5dLsIJ1VrkqEuuTvo= X-MC-Unique: eGnFS5LfPXWWAqt6DZwz6g-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 3/5] python/machine: use connect-based interface for existing sockets Date: Wed, 31 May 2023 16:43:36 -0400 Message-Id: <20230531204338.1656158-4-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.129.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=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: 1685565930393100003 Content-Type: text/plain; charset="utf-8" Instead of using accept() with sockets (which uses open_with_socket()), use calls to connect() to utilize existing sockets instead. A benefit of this is more robust error handling already present within the connect() call that isn't present in open_with_socket(). Signed-off-by: John Snow Message-id: 20230517163406.2593480-4-jsnow@redhat.com Signed-off-by: John Snow --- python/qemu/machine/machine.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index e57c254484..cc636cb6bd 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -337,18 +337,17 @@ def _pre_launch(self) -> None: self._remove_files.append(self._console_address) =20 if self._qmp_set: - monitor_address =3D None sock =3D None if self._monitor_address is None: self._sock_pair =3D socket.socketpair() sock =3D self._sock_pair[1] if isinstance(self._monitor_address, str): self._remove_files.append(self._monitor_address) - monitor_address =3D self._monitor_address + self._qmp_connection =3D QEMUMonitorProtocol( - address=3Dmonitor_address, + address=3Dself._monitor_address, sock=3Dsock, - server=3DTrue, + server=3Dbool(self._monitor_address), nickname=3Dself._name ) =20 @@ -370,7 +369,10 @@ def _post_launch(self) -> None: if self._sock_pair: self._sock_pair[0].close() if self._qmp_connection: - self._qmp.accept(self._qmp_timer) + if self._sock_pair: + self._qmp.connect() + else: + self._qmp.accept(self._qmp_timer) =20 def _close_qemu_log_file(self) -> None: if self._qemu_log_file is not None: --=20 2.40.1 From nobody Mon Apr 29 18:59:07 2024 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=1685565904; cv=none; d=zohomail.com; s=zohoarc; b=kF9kTlupAw6Rvu78mJ4xAilmyvM7FL0EFQgeINMiI+cg+PYKE3WV+m4fnDjOXd5i6eaDcgFwFN9Ayp86oNJHgvBppi0JTdMz3R7yIESXrnL7W/weSMAGT5qar4Nx5SJVqhB9bs9nkEuaEArn8G6YNc3g/ZOoyLzqQlo3JiYHiaA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565904; 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=CBT/weJlxAYWQ0SKX//myh2hjHsaYiMvG8gg0FAgmVM=; b=UpTScCTbVYQ06MNKpim6VYh7mVnpmCQc6fqcShhHKkEzTPPyGXPQ/wWmhaPSfrLVe/Cc9NXIcpMaKVfa8uBzmxAiRvAXqxus3KrPqW5yKKSw6Qnf9c7SjmmvTISwP1NPP75ZwsA98nADo4JyTSePkdAQj6Jrn4X0OFCx9LxgSIU= 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 1685565904398691.0253709257981; Wed, 31 May 2023 13:45:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4Sfm-00062Q-R8; Wed, 31 May 2023 16:43:58 -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 1q4Sfk-0005zO-Pm for qemu-devel@nongnu.org; Wed, 31 May 2023 16:43:56 -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 1q4Sfd-0004uq-EW for qemu-devel@nongnu.org; Wed, 31 May 2023 16:43:55 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-311-syhp03j6NNmmjVX804C_IQ-1; Wed, 31 May 2023 16:43:42 -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 F040A29AA3B4; Wed, 31 May 2023 20:43:41 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7033A2029F6D; Wed, 31 May 2023 20:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685565827; 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=CBT/weJlxAYWQ0SKX//myh2hjHsaYiMvG8gg0FAgmVM=; b=JeAxRZUGLhZ+mY/ytD3yWUWRqG+RkITo8IE1ZJTpXn0qIylzQKmJ0AlkaOPhxJTnYVcJRC Eo0YYGTi05AQnT2CtFFtyguNJrTzajLYyHwVCE5tWQ1UUCn+Yh8O8I8LI1/qSM7vtLhsLp iM1yWGhDTGRxhLmC7NhhNBEJMHLo5Ec= X-MC-Unique: syhp03j6NNmmjVX804C_IQ-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 4/5] python/qmp/legacy: remove open_with_socket() calls Date: Wed, 31 May 2023 16:43:37 -0400 Message-Id: <20230531204338.1656158-5-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.129.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=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: 1685565905711100001 Content-Type: text/plain; charset="utf-8" Favor using connect() when passing a socket instead of open_with_socket(). Simultaneously, update constructor calls to use the combined address argument for QEMUMonitorProtocol(). Signed-off-by: John Snow Message-id: 20230517163406.2593480-5-jsnow@redhat.com Signed-off-by: John Snow --- python/qemu/machine/machine.py | 7 ++++--- python/qemu/qmp/legacy.py | 29 ++++++++++++----------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index cc636cb6bd..c16a0b6fed 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -337,16 +337,17 @@ def _pre_launch(self) -> None: self._remove_files.append(self._console_address) =20 if self._qmp_set: - sock =3D None if self._monitor_address is None: self._sock_pair =3D socket.socketpair() sock =3D self._sock_pair[1] if isinstance(self._monitor_address, str): self._remove_files.append(self._monitor_address) =20 + sock_or_addr =3D self._monitor_address or sock + assert sock_or_addr is not None + self._qmp_connection =3D QEMUMonitorProtocol( - address=3Dself._monitor_address, - sock=3Dsock, + sock_or_addr, server=3Dbool(self._monitor_address), nickname=3Dself._name ) diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py index b1eb3f360f..e1e9383978 100644 --- a/python/qemu/qmp/legacy.py +++ b/python/qemu/qmp/legacy.py @@ -68,34 +68,31 @@ class QEMUMonitorProtocol: Provide an API to connect to QEMU via QEMU Monitor Protocol (QMP) and then allow to handle commands and events. =20 - :param address: QEMU address, can be either a unix socket path (strin= g) - or a tuple in the form ( address, port ) for a TCP - connection or None - :param sock: a socket or None + :param address: QEMU address, can be a unix socket path (string), a t= uple + in the form ( address, port ) for a TCP connection, o= r an + existing `socket.socket` object. :param server: Act as the socket server. (See 'accept') + Not applicable when passing a socket directly. :param nickname: Optional nickname used for logging. """ =20 def __init__(self, - address: Optional[SocketAddrT] =3D None, - sock: Optional[socket.socket] =3D None, + address: Union[SocketAddrT, socket.socket], server: bool =3D False, nickname: Optional[str] =3D None): =20 - assert address or sock + if server and isinstance(address, socket.socket): + raise ValueError( + "server argument should be False when passing a socket") + self._qmp =3D QMPClient(nickname) self._aloop =3D asyncio.get_event_loop() self._address =3D address - self._sock =3D sock self._timeout: Optional[float] =3D None =20 if server: - if sock: - assert self._sock is not None - self._sync(self._qmp.open_with_socket(self._sock)) - else: - assert self._address is not None - self._sync(self._qmp.start_server(self._address)) + assert not isinstance(self._address, socket.socket) + self._sync(self._qmp.start_server(self._address)) =20 _T =3D TypeVar('_T') =20 @@ -150,13 +147,11 @@ def connect(self, negotiate: bool =3D True) -> Option= al[QMPMessage]: :return: QMP greeting dict, or None if negotiate is false :raise ConnectError: on connection errors """ - addr_or_sock =3D self._address or self._sock - assert addr_or_sock is not None self._qmp.await_greeting =3D negotiate self._qmp.negotiate =3D negotiate =20 self._sync( - self._qmp.connect(addr_or_sock) + self._qmp.connect(self._address) ) return self._get_greeting() =20 --=20 2.40.1 From nobody Mon Apr 29 18:59:07 2024 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=1685565932; cv=none; d=zohomail.com; s=zohoarc; b=HG9HHoXHLJkYF1EgayEI+rsUvCZzP6kfw+mXmI0B3R9s16K6U9CZzffQXfKvGUZ/Jw+fDdJlHDMec1e6Sze3aj2VE9+6CPRAjci84es4ApaFnCsnRsEWymlY5lgsZCfe6ZJq3TaHUhJ7hkvdppsiomPD/CqW8pehhmcK0CqYtNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565932; 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=S/mcmFGBhzkNPflpwHQgx/rQKKYb1f2hRywVQ68hhXE=; b=jwcL6jzUvDLKzAwgx4/BPtioTUHTh8Pjay3PfL/dLrRjhHB56EE1hz0Za7OIEfzxMaQujKefFzUBGPKm8z+m6Y8hxqBgBGTScgLvGxrDrihf2yRZwv3GqghxR4dFGwyWQAeNkfqrnsPCifIA8M8QXkAe+RhZ/9lw9cqugd0n1gg= 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 1685565932790219.43957050099573; Wed, 31 May 2023 13:45:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4Sfp-00063K-Qm; Wed, 31 May 2023 16:44:01 -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 1q4Sfo-00062v-OW for qemu-devel@nongnu.org; Wed, 31 May 2023 16:44:00 -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 1q4SfZ-0004to-1K for qemu-devel@nongnu.org; Wed, 31 May 2023 16:44:00 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-CWoNsEiANTKbYcJQUQJlrw-1; Wed, 31 May 2023 16:43:43 -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 8921C1C08DA7; Wed, 31 May 2023 20:43:42 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07F3C200B68F; Wed, 31 May 2023 20:43:42 +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=S/mcmFGBhzkNPflpwHQgx/rQKKYb1f2hRywVQ68hhXE=; b=XvMgmN6ox0xxPGBbTCkkLuvBqgnJBGOpuTiCppENPNBN5tqaik/W1kJL8tiLYLBlgtnwaP eb04c/g+xzY8JCsIT7oD7dSE64GI56b+JDyopqPBvtHro7MfBo+shI1fEs2KIamuXaCsv6 BQKwGEmAGtKDwYQnv+bh6ugJsQG8eAY= X-MC-Unique: CWoNsEiANTKbYcJQUQJlrw-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 5/5] Revert "python/qmp/protocol: add open_with_socket()" Date: Wed, 31 May 2023 16:43:38 -0400 Message-Id: <20230531204338.1656158-6-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.129.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, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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: 1685565933655100001 Content-Type: text/plain; charset="utf-8" This reverts commit a3cfea92e2030926e00a2519d299384ea648e36e. (It's being rolled back in favor of a different API, which brings the in-tree and out-of-tree versions of qemu.qmp back in sync.) Signed-off-by: John Snow Message-id: 20230517163406.2593480-6-jsnow@redhat.com Signed-off-by: John Snow --- python/qemu/qmp/protocol.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py index d534db4631..753182131f 100644 --- a/python/qemu/qmp/protocol.py +++ b/python/qemu/qmp/protocol.py @@ -297,19 +297,6 @@ async def start_server_and_accept( await self.accept() assert self.runstate =3D=3D Runstate.RUNNING =20 - @upper_half - @require(Runstate.IDLE) - async def open_with_socket(self, sock: socket.socket) -> None: - """ - Start connection with given socket. - - :param sock: A socket. - - :raise StateError: When the `Runstate` is not `IDLE`. - """ - self._reader, self._writer =3D await asyncio.open_connection(sock= =3Dsock) - self._set_state(Runstate.CONNECTING) - @upper_half @require(Runstate.IDLE) async def start_server(self, address: SocketAddrT, @@ -357,12 +344,11 @@ async def accept(self) -> None: protocol-level failure occurs while establishing a new session, the wrapped error may also be an `QMPError`. """ - if not self._reader: - if self._accepted is None: - raise QMPError("Cannot call accept() before start_server()= .") - await self._session_guard( - self._do_accept(), - 'Failed to establish connection') + if self._accepted is None: + raise QMPError("Cannot call accept() before start_server().") + await self._session_guard( + self._do_accept(), + 'Failed to establish connection') await self._session_guard( self._establish_session(), 'Failed to establish session') --=20 2.40.1