From nobody Sun Feb 8 19:03:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1623097283; cv=none; d=zohomail.com; s=zohoarc; b=IEnDL7YCPTsz5NIiIv9CQHr+xIUSN/O931T0PpJaJ3NoBmWnU6vXk71+QbL+q7b7PqhWA78/vjCG25VSTWCsz50P5d0FZP4GRaC71t4jaymTIxJ5idFcy+8Y2y3vmgRpJOWZGChZTjBcntkCRReQ0kxAg97HIST7nud4TggYLcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623097283; 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=P83Oz0etO9/+oEHLz0XwcO5PY8Ka7apyx/+3fDzVr6Y=; b=eqxf30q6FhGGZ9wkHt0exTkHhox9lmDRqhyEMQ7Qkar+EK2LXd8qe1H1BV+jpSAnWd0mfaUC5GqOxOv/apIPE410gbJHgrW30unfv5/eq8lEivHbWfzLoEyD9lbmTXmmJmV7sGSmYIswvK3fgJ2XQz2IXE6oFxu46oEoHqgV5Tw= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162309728360410.367548119211051; Mon, 7 Jun 2021 13:21:23 -0700 (PDT) Received: from localhost ([::1]:50522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqLkQ-0007Sb-Hy for importer@patchew.org; Mon, 07 Jun 2021 16:21:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqLX2-0004H9-Im for qemu-devel@nongnu.org; Mon, 07 Jun 2021 16:07:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqLWy-0006WU-2S for qemu-devel@nongnu.org; Mon, 07 Jun 2021 16:07:32 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-138-05BgXlbmN6KZAI1Lmd0lYA-1; Mon, 07 Jun 2021 16:07:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 674F6C73AB; Mon, 7 Jun 2021 20:07:11 +0000 (UTC) Received: from scv.redhat.com (ovpn-116-137.rdu2.redhat.com [10.10.116.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34C7B5C1C2; Mon, 7 Jun 2021 20:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623096445; 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=P83Oz0etO9/+oEHLz0XwcO5PY8Ka7apyx/+3fDzVr6Y=; b=J7tBfEAFW7VdS930KCR8WkhbHWngu7H9NlZ+8MllplBgO5wXXGSDur/8MLahAcMgnV3CbM JQzrKfq75HHNSGWHAxVG/yuCR1aQslAr9FTHJ6Ph17y0siGfAWyuWfRY/cyQagt2bRerjj OhZaikJzL4jahPSysTlyUWK2wDsi9Sw= X-MC-Unique: 05BgXlbmN6KZAI1Lmd0lYA-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 18/42] scripts/qmp-shell: Add pretty attribute to HMP shell Date: Mon, 7 Jun 2021 16:06:25 -0400 Message-Id: <20210607200649.1840382-19-jsnow@redhat.com> In-Reply-To: <20210607200649.1840382-1-jsnow@redhat.com> References: <20210607200649.1840382-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.2, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Niteesh G . S ." , Cleber Rosa , John Snow , Markus Armbruster , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It's less useful, but it makes the initialization methods LSP consistent, which quiets a mypy complaint. Signed-off-by: John Snow --- scripts/qmp/qmp-shell | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 5317dcd516..de5fa189f0 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -322,8 +322,8 @@ class QMPShell(qmp.QEMUMonitorProtocol): =20 =20 class HMPShell(QMPShell): - def __init__(self, address): - super().__init__(address) + def __init__(self, address, pretty=3DFalse): + super().__init__(address, pretty) self.__cpu_index =3D 0 =20 def __cmd_completion(self): @@ -421,12 +421,9 @@ def main(): if args.qmp_server is None: parser.error("QMP socket or TCP address must be specified") =20 - qemu: QMPShell + shell_class =3D HMPShell if args.hmp else QMPShell try: - if args.hmp: - qemu =3D HMPShell(args.qmp_server) - else: - qemu =3D QMPShell(args.qmp_server, args.pretty) + qemu =3D shell_class(args.qmp_server, args.pretty) except qmp.QMPBadPortError: parser.error(f"Bad port number: {args.qmp_server}") return # pycharm doesn't know error() is noreturn --=20 2.31.1