From nobody Tue Feb 10 05:44:35 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=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