From nobody Mon Feb 9 03:13:06 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=1604452155; cv=none; d=zohomail.com; s=zohoarc; b=ccdbWZMpMTFF7zS98MsfkSr4+bA/8r2F/uI28oRKKjKczCgf1JPBYVAD5HY0/iBuVcZSk01zRJW+qjUWj3NHK7kvJA91qSdsz7Xi07kRo1aHtZ3nyLGS8q1HVYmmDaYajFBem1XWz65gWsaKMVDD73C5/y9bL6n/RzTiamcaDUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604452155; 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=a1XHIBeG+DluaONg2ht+r/5cfSSpprDO9b+48DgbMW0=; b=QRXzk8iqaCPP4Qnv9m9GetKVxkvBAOWItHia+Wuipj1/1V9MLHuYvFace0nZQioba1ozvrcBG5o+qdfqCM7kteuAw4zGMoreBxd//z6KZ0COcw7aWzKEPTip+N5DtXIfUgAFDm2OwXZUzS5wpP9lhZkqPvt45NuoqkB5Omj7RSk= 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 1604452155478879.4559619334649; Tue, 3 Nov 2020 17:09:15 -0800 (PST) Received: from localhost ([::1]:58786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ka7IY-0003Eq-8L for importer@patchew.org; Tue, 03 Nov 2020 20:09:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ka6nd-0007B2-22 for qemu-devel@nongnu.org; Tue, 03 Nov 2020 19:37:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:21798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1ka6nb-0004vm-Di for qemu-devel@nongnu.org; Tue, 03 Nov 2020 19:37:16 -0500 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-116-zDAp5zeNPue1HcQePq7_Jw-1; Tue, 03 Nov 2020 19:37:13 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33831802B56 for ; Wed, 4 Nov 2020 00:37:12 +0000 (UTC) Received: from scv.redhat.com (ovpn-119-97.rdu2.redhat.com [10.10.119.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AA9C55766; Wed, 4 Nov 2020 00:37:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604450234; 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=a1XHIBeG+DluaONg2ht+r/5cfSSpprDO9b+48DgbMW0=; b=Z2pbJY5qODgn1YoQPodd7lsdvQlZjofXYFr0r8a8oja9K1n8U88ACEQvLG4GLtiJsL1632 KjH9gr3VOwpGWaJpc6pyPzTfZlp5zUTxxCVHskfBNX4DEzC+jKlA7tSycY4yaxB4up7fD9 kWThENCbFiv2ULkYsggsUoAmgSB9Uac= X-MC-Unique: zDAp5zeNPue1HcQePq7_Jw-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v2 48/72] scripts/qmp-shell: Add pretty attribute to HMP shell Date: Tue, 3 Nov 2020 19:35:38 -0500 Message-Id: <20201104003602.1293560-49-jsnow@redhat.com> In-Reply-To: <20201104003602.1293560-1-jsnow@redhat.com> References: <20201104003602.1293560-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=63.128.21.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 01:02:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=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: 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. 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 5a72b9d39502..ba27e9801c68 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -319,8 +319,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): @@ -418,12 +418,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.26.2