From nobody Tue Feb 10 02:54:38 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=1673424468; cv=none; d=zohomail.com; s=zohoarc; b=bnSD7c7e/NexY7CieS1hJdqDJbW0mh6b4mAXmhbvKsE+hLyB0zXYt9K8idpsnAaMUBAZeiPwC5QHTzZgPS+a2kX8Ik9OVYdEPV6W40Zjv7Kwv3J8o/jxxJmSOX8Ets2QCTtVlz0AM8ciIvEmPZkxpwE0wIzmDXEzT+2bkhN4AQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673424468; h=Content-Type: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=qHU/Cv3Zy/GsQ5swx7DU249gMPLTasss25z+tC6OtUw=; b=QV5mD8vIaW1EsB2BQZ3nj4oxLjsO8KRQH0Gh/hgZlqHAZ0fF4iFBvsO3R+11E2cjKJi0FMNCZrGscAhntpU1oZ2jVCB/m2MdH5UCfVJtyJ/6UKVRVNDIaiy+wZ5QRQnx/B2kJbXL/0DeW3hmL1FlUElwE19tAfwlSxuOuyljNcY= 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 SMTP id 1673424468817138.06223027598537; Wed, 11 Jan 2023 00:07:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFW2z-0000aX-Av; Wed, 11 Jan 2023 03:01:21 -0500 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 1pFW2x-0000Vr-QC for qemu-devel@nongnu.org; Wed, 11 Jan 2023 03:01:19 -0500 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 1pFW2w-0007mr-7F for qemu-devel@nongnu.org; Wed, 11 Jan 2023 03:01:19 -0500 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-659-dmXbu1xeMqSlmqWVOvVL3A-1; Wed, 11 Jan 2023 03:01:16 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB4C3183B3CA for ; Wed, 11 Jan 2023 08:01:15 +0000 (UTC) Received: from localhost (unknown [10.39.208.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id D709D492C14; Wed, 11 Jan 2023 08:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673424077; 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=qHU/Cv3Zy/GsQ5swx7DU249gMPLTasss25z+tC6OtUw=; b=YM1PjuvdKt5QOFaOpw+7e9fn73IgnEp4hclreG+F0ibd+TxkFf9sWZntBUIqis1kK2yaMW zdD47cK6OglNDgKTfbySOQSoIcR9twAhO9QquYZ8QYVOydgrI1mBPG/WvYo8lVWehZPSRE zGsUcSzg2VmBViL9BLgmP8j2zUSXDnU= X-MC-Unique: dmXbu1xeMqSlmqWVOvVL3A-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: berrange@redhat.com, Beraldo Leal , John Snow , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v3 2/3] python/qmp/legacy: make QEMUMonitorProtocol accept a socket Date: Wed, 11 Jan 2023 12:01:00 +0400 Message-Id: <20230111080101.969151-3-marcandre.lureau@redhat.com> In-Reply-To: <20230111080101.969151-1-marcandre.lureau@redhat.com> References: <20230111080101.969151-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=marcandre.lureau@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 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: 1673424470366100003 From: Marc-Andr=C3=A9 Lureau Teach QEMUMonitorProtocol to accept an exisiting socket. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- python/qemu/qmp/legacy.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py index 1951754455..8b09ee7dbb 100644 --- a/python/qemu/qmp/legacy.py +++ b/python/qemu/qmp/legacy.py @@ -22,6 +22,7 @@ # =20 import asyncio +import socket from types import TracebackType from typing import ( Any, @@ -69,22 +70,32 @@ class QEMUMonitorProtocol: =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 + connection or None + :param sock: a socket or None :param server: Act as the socket server. (See 'accept') :param nickname: Optional nickname used for logging. """ =20 - def __init__(self, address: SocketAddrT, + def __init__(self, + address: Optional[SocketAddrT] =3D None, + sock: Optional[socket.socket] =3D None, server: bool =3D False, nickname: Optional[str] =3D None): =20 + assert address or sock 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: - self._sync(self._qmp.start_server(self._address)) + 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)) =20 _T =3D TypeVar('_T') =20 @@ -139,6 +150,7 @@ def connect(self, negotiate: bool =3D True) -> Optional= [QMPMessage]: :return: QMP greeting dict, or None if negotiate is false :raise ConnectError: on connection errors """ + assert self._address is not None self._qmp.await_greeting =3D negotiate self._qmp.negotiate =3D negotiate =20 --=20 2.39.0