From nobody Mon Feb 9 18:18:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645823650053392.4262408876069; Fri, 25 Feb 2022 13:14:10 -0800 (PST) Received: from localhost ([::1]:34170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNhui-0003hB-HH for importer@patchew.org; Fri, 25 Feb 2022 16:14:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNhi5-0003OV-Cl for qemu-devel@nongnu.org; Fri, 25 Feb 2022 16:01:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:31475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNhi2-0005CK-EY for qemu-devel@nongnu.org; Fri, 25 Feb 2022 16:01:05 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-425-fDeCxZwVN3ioe3D0sgXNOQ-1; Fri, 25 Feb 2022 16:00:58 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C8115200; Fri, 25 Feb 2022 21:00:57 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CC871081302; Fri, 25 Feb 2022 21:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645822861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qBeIBPnr1GcAbXlScMYi5nSzr6XuOopJrddRAo1JUl4=; b=e0fLLy7i0afYrwAWhkSaOStNvIJRDmN6C6LU1XurYRTwrMW++T1qlW+7RqfyxLoFGhhNWM RKhO+RZP6CeY6Ks8VTkZoGBT5HmRsJugl1g1IDDPtW6eB/ATJNvDXaWiQdWkG8EzjwFur7 pcWNNXbUeEyHu7R8jnI1ZB1CnkzFIsQ= X-MC-Unique: fDeCxZwVN3ioe3D0sgXNOQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 10/10] python/aqmp: drop _bind_hack() Date: Fri, 25 Feb 2022 15:59:48 -0500 Message-Id: <20220225205948.3693480-11-jsnow@redhat.com> In-Reply-To: <20220225205948.3693480-1-jsnow@redhat.com> References: <20220225205948.3693480-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Kevin Wolf , Peter Maydell , Daniel Berrange , Beraldo Leal , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645823651635100001 Content-Type: text/plain; charset="utf-8" With the better fix in place, we don't need this anymore. Fixes: b0b662bb2b3 Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- python/qemu/aqmp/legacy.py | 2 +- python/qemu/aqmp/protocol.py | 41 +++--------------------------------- 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/python/qemu/aqmp/legacy.py b/python/qemu/aqmp/legacy.py index cb50e60564..46026e9fdc 100644 --- a/python/qemu/aqmp/legacy.py +++ b/python/qemu/aqmp/legacy.py @@ -57,7 +57,7 @@ def __init__(self, address: SocketAddrT, self._timeout: Optional[float] =3D None =20 if server: - self._sync(self._aqmp.start_server(address)) + self._sync(self._aqmp.start_server(self._address)) =20 _T =3D TypeVar('_T') =20 diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/aqmp/protocol.py index 2ecba14555..36fae57f27 100644 --- a/python/qemu/aqmp/protocol.py +++ b/python/qemu/aqmp/protocol.py @@ -18,7 +18,6 @@ from enum import Enum from functools import wraps import logging -import socket from ssl import SSLContext from typing import ( Any, @@ -242,9 +241,6 @@ def __init__(self, name: Optional[str] =3D None) -> Non= e: self._runstate =3D Runstate.IDLE self._runstate_changed: Optional[asyncio.Event] =3D None =20 - # Workaround for bind() - self._sock: Optional[socket.socket] =3D None - # Server state for start_server() and _incoming() self._server: Optional[asyncio.AbstractServer] =3D None self._accepted: Optional[asyncio.Event] =3D None @@ -535,34 +531,6 @@ async def _incoming(self, self._reader, self._writer =3D (reader, writer) self._accepted.set() =20 - def _bind_hack(self, address: Union[str, Tuple[str, int]]) -> None: - """ - Used to create a socket in advance of accept(). - - This is a workaround to ensure that we can guarantee timing of - precisely when a socket exists to avoid a connection attempt - bouncing off of nothing. - - Python 3.7+ adds a feature to separate the server creation and - listening phases instead, and should be used instead of this - hack. - """ - if isinstance(address, tuple): - family =3D socket.AF_INET - else: - family =3D socket.AF_UNIX - - sock =3D socket.socket(family, socket.SOCK_STREAM) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - - try: - sock.bind(address) - except: - sock.close() - raise - - self._sock =3D sock - @upper_half async def _do_start_server(self, address: SocketAddrT, ssl: Optional[SSLContext] =3D None) -> None: @@ -589,21 +557,19 @@ async def _do_start_server(self, address: SocketAddrT, if isinstance(address, tuple): coro =3D asyncio.start_server( self._incoming, - host=3DNone if self._sock else address[0], - port=3DNone if self._sock else address[1], + host=3Daddress[0], + port=3Daddress[1], ssl=3Dssl, backlog=3D1, limit=3Dself._limit, - sock=3Dself._sock, ) else: coro =3D asyncio.start_unix_server( self._incoming, - path=3DNone if self._sock else address, + path=3Daddress, ssl=3Dssl, backlog=3D1, limit=3Dself._limit, - sock=3Dself._sock, ) =20 # Allow runstate watchers to witness 'CONNECTING' state; some @@ -630,7 +596,6 @@ async def _do_accept(self) -> None: await self._accepted.wait() assert self._server is None self._accepted =3D None - self._sock =3D None =20 self.logger.debug("Connection accepted.") =20 --=20 2.34.1