From nobody Sat May 18 08:14:14 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=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 From nobody Sat May 18 08:14:14 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=1684341338; cv=none; d=zohomail.com; s=zohoarc; b=l1vM9z4y9hiu3cM6W215t3J/ycu69M3xFR7tyykNq1/0kN9ukcHgH5V/mSSPy/zgc5ljQ1LSZ1waxz2RPIFuZ1ih4pIDYyCyKj3fCs0ok1LP8YBH2dUD26GjTvPf6Ib3HJ/RomLu3zQWdYvQOdvC2EDUponSi7IJGRurNbl+IzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684341338; 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=HEjobai700jMX5/y+fz3ZFDeA7T/MiRTIuEevvsDmQ4=; b=WYuyuccIxAXiEto231wDKMjSCEjSvbp2Djkz4UJYjvfUBk2arAADgqF4DabNVmirHSw1A0vfAlZKfRUZhFu2k3oOL6JyWgn12c++GM/nQEtKwIjrcXSeMFZLHMVYpEBC+egL2/X1qJjg9yDKf6fQTLzA7/wN6USEu4+DxcfvFVM= 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 1684341338602108.31275099642608; Wed, 17 May 2023 09:35:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzK6T-0004Bi-4L; Wed, 17 May 2023 12:34:17 -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 1pzK6S-0004BE-5E for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:16 -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 1pzK6Q-0005zR-OB for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:15 -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-327-UxZCh5IROYiNt_b82eZx7w-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 290FD886470; Wed, 17 May 2023 16:34:08 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id D470F2166B31; 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=1684341254; 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=HEjobai700jMX5/y+fz3ZFDeA7T/MiRTIuEevvsDmQ4=; b=HfA+MzL55IDJLNeswrY7BtOO3wXs7u5JENL5iTtLYaTyG/X/UfkKXI6ITzzlP5icd02+Ou wrlaQe+2+Q9bUcGGyttM7ESJ5AGqfTtOyF8u1iE/vnzi4PPZEYwPVDgZt0waOVS6WIXrF8 pB20aiu/Fkf5lK+dp4SZp89T022upLY= X-MC-Unique: UxZCh5IROYiNt_b82eZx7w-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 2/5] python/qmp/legacy: allow using sockets for connect() Date: Wed, 17 May 2023 12:34:03 -0400 Message-Id: <20230517163406.2593480-3-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: 1684341348215100001 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 --- 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.0 From nobody Sat May 18 08:14:14 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=1684341345; cv=none; d=zohomail.com; s=zohoarc; b=V5G3f82NgoM8O5Kw69JmwAVnZxLyaRKSvf1X+ozc22XfclxAxJHPYpiZaxFcI+bA5pO2LoNuqKJ0rHt7PG/7ZqExWMId4gjeb5Me+SbgGBAb97sqQaJ4vKVtI+tO9BsNEQ1S2ybQjIjI9BTsmqo75kypSwQzH+dAFE9xoJ15eNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684341345; 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=iABtwQKgwfPMy6omTp+ZwjCa+l0pA48r2W7bbavjBBY=; b=H3APQ5cnixXLWOSZi0nfy3+E0Iwj/s3q6wNL6AqmXAobZ29o/YEw3GDas80zCn9lcYuz71+JKqn7iTUVNJUYC4+ZWwyVf5ZRE/EN4L7exRdl+O5oDUikMEgplMQLpvpYVh/UJDpeCdN3LaVHOdVpjfFRfn30miEiDGtOOoVVUzo= 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 1684341345040889.8195065961255; Wed, 17 May 2023 09:35:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzK6R-0004BC-JQ; Wed, 17 May 2023 12:34:15 -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 1pzK6Q-0004AY-8H for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:14 -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 1pzK6O-0005z4-Rt for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:14 -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-124-qUjPnkQaP4SS6D59nm66nQ-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 84C7419711A1; Wed, 17 May 2023 16:34:08 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39B212166B31; Wed, 17 May 2023 16:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684341252; 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=iABtwQKgwfPMy6omTp+ZwjCa+l0pA48r2W7bbavjBBY=; b=Up77TMHVB1bSTRV6HaZJU4WL7xkTXpKbW2F9D5axwQr2uQVdNzr7o/fteZdX6WEECur8uK JicVSuhX2jdaZSeXhIDVPYdt00eEabAsEqUcVnkYDytwQuPggvCL8tE5Ku9ittJtQrqinC D4zg5cvZeMW1R5Slvqc/ESjWgLRrOMs= X-MC-Unique: qUjPnkQaP4SS6D59nm66nQ-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 3/5] python/machine: use connect-based interface for existing sockets Date: Wed, 17 May 2023 12:34:04 -0400 Message-Id: <20230517163406.2593480-4-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.133.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, RCVD_IN_MSPIKE_H2=-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: , 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: 1684341345674100003 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 --- 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.0 From nobody Sat May 18 08:14:14 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=1684341318; cv=none; d=zohomail.com; s=zohoarc; b=FkTeRPGOfegMlRCB6417HYUmzu4+rGh8tsc3hufrg4MqaOy8r+d9lr7MZps9jfPZQ7IN4omU6AUKP4NgzhmOXgV1ixDSH5HyhOSx0hfRQVYbnRBRq1zDCmXS4w11Yl+BEU4uP6VIICCOdS0y1K2SqAqxge7t6/rYmBstNs1JFRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684341318; 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=3G6SEwUqL/VqKHEG8+ZvTfBprd0ImLbUb63chGTd/Fg=; b=K81Rab3uJ5Ef7BETQALNXVzUo/oBNWU6dGfT0xKiP39+jiZHlWX0klsYq2KnCAfvEixgyHAN03lOaz6h2a1naN8LWN9Qwco2+wQS1yf9IZtVNG7GbSj1n3MNY1oFM1WSibK71HQZbFD1SaZc6dDXQ5WxfK4EkuicSk3B0gyibwA= 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 1684341318199457.69732681096684; Wed, 17 May 2023 09:35:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzK6S-0004Ba-Jt; Wed, 17 May 2023 12:34:16 -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 1pzK6R-0004Ap-34 for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:15 -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 1pzK6P-0005zE-Jc for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:14 -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-203-_oiPjXriNTSotOBikZj2Gg-1; Wed, 17 May 2023 12:34:09 -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 DBF61101A555; Wed, 17 May 2023 16:34:08 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 922502166B31; Wed, 17 May 2023 16:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684341252; 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=3G6SEwUqL/VqKHEG8+ZvTfBprd0ImLbUb63chGTd/Fg=; b=em+dvdnWpnymq9qb451kUrkh8vhgNIqVd2o1WbRrX+eUUs5cidYTIYN9NXLWTFSf5Dl1y8 Sa03YT2qVL1XwkNM5qXQ9A8CY97blRcxS2brFLsAcZ5lVSEtEiZp9DBf6UoVmTYry/RRM6 lVvK9/wYxSI5w5f+Txcy+7xcjujfpLo= X-MC-Unique: _oiPjXriNTSotOBikZj2Gg-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 4/5] python/qmp/legacy: remove open_with_socket() calls Date: Wed, 17 May 2023 12:34:05 -0400 Message-Id: <20230517163406.2593480-5-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: 1684341328446100001 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 --- 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.0 From nobody Sat May 18 08:14:14 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=1684341286; cv=none; d=zohomail.com; s=zohoarc; b=BGXk1rE44pz4k/R6+9V/2vgfc0I13fYHSaBPwBcl+twMc4h7KdLqb7byTTU2kXJBS0zu/NOF1TKE8GUJJ0JpDpDnlU+nZ136zoRRGq/eNPfkfF/PSX44wh3VsfipP7/DVrzaAdrW94d7IXJ2G+6TUMAWmsmotLGwpUbxxxGx11E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684341286; 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=g+eQZFol/ic3DDC6RMlVjahb8jopKiPmqA+a0nlc4+0=; b=J0ZJ76ZSRe9gyw7363c8G8pqQrderluCtx9EeC0ZZA2D2sVD6RnQgNcPW9tUazsq2SFsKxXEdqvUprQ0o6B9tbibdfoYh8pyvlkZDpNgZFMiKCGMuj3G7JjkWYh6DCcKSj74nBSazHObLn3UiobQfNRLG76rJ+kA5pLnFm2aaKE= 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 1684341285663168.60170780292992; Wed, 17 May 2023 09:34:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzK6U-0004C6-4w; Wed, 17 May 2023 12:34:18 -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 1pzK6T-0004Bj-5r for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:17 -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 1pzK6R-0005ze-Lq for qemu-devel@nongnu.org; Wed, 17 May 2023 12:34:16 -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-53-NDh4QRMuPq263mJ7PgOE2Q-1; Wed, 17 May 2023 12:34:10 -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 40EB785A588; Wed, 17 May 2023 16:34:09 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.9.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9F102166B31; Wed, 17 May 2023 16:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684341254; 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=g+eQZFol/ic3DDC6RMlVjahb8jopKiPmqA+a0nlc4+0=; b=FZ/xxw/BDIGZz5jTooBaS2OjzqQiKhdVPSE4WE5Cc5zFIzUlYwFmYAeAeh9vOVbgK1cyti TaJ2524cLToQN1VWuSaB16QrCCVZOUukGWeJtfNgGyzKaxNjv+2mCYxhi/0zOw3hMIS9Za R4adHClshqXjszIgB1Y7d+btjlVleZo= X-MC-Unique: NDh4QRMuPq263mJ7PgOE2Q-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 5/5] Revert "python/qmp/protocol: add open_with_socket()" Date: Wed, 17 May 2023 12:34:06 -0400 Message-Id: <20230517163406.2593480-6-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: 1684341322666100001 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 --- 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.0