From patchwork Wed May 17 16:34:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 13245323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B966C77B75 for ; Wed, 17 May 2023 16:35:38 +0000 (UTC) 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 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= 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 X-MC-Unique: UxZCh5IROYiNt_b82eZx7w-1 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) 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_Lureau?= 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 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 = True) -> Optional[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 = self._address or self._sock + assert addr_or_sock is not None self._qmp.await_greeting = negotiate self._qmp.negotiate = negotiate self._sync( - self._qmp.connect(self._address) + self._qmp.connect(addr_or_sock) ) return self._get_greeting()