From nobody Mon Feb 9 13:23:57 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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1696607025; cv=none; d=zohomail.com; s=zohoarc; b=TPahwHs6aS7x2iAu3Ei+fNcMZZvoW2PXb2waUMjSCf+uX7/ry5EQyUF4yIc6LeYc+Uk8jNAn4nxu7FraGAo2eTJ/XHuJsYZmyve+J+XSPFFfCId/o44R5Q+OP9+sYVifuzOWhNlq6NreMF5sWhGogOH1njsFvv1VRSUQr5zDgAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696607025; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wTcyjx92aXx2sVGdLGZxJJJod8uOvmF/D/xvuHmRDF0=; b=nqMGth/c4iq9nOgMvJja+sK1l4SW/MLzLf1Y7WUrmUlPzS08NLmgSmxu6z0bn+Q9KuWP1jwB/hSkBaNVOULh1B2VBDSAtrWT5lbsbW6iZf+2w9kJ4bkV4OXke6kyl0CGX62bMD0UjewWh4kIcGllru9yzvX0dj8v5BzNSue+uv8= 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 1696607025148639.3264153410914; Fri, 6 Oct 2023 08:43:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qomxc-0006Ug-Vz; Fri, 06 Oct 2023 11:41:53 -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 1qomxb-0006UB-Sk; Fri, 06 Oct 2023 11:41:51 -0400 Received: from forwardcorp1c.mail.yandex.net ([2a02:6b8:c03:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qomxY-0003W6-W4; Fri, 06 Oct 2023 11:41:51 -0400 Received: from mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:3a8c:0:640:ec94:0]) by forwardcorp1c.mail.yandex.net (Yandex) with ESMTP id 2389F5E910; Fri, 6 Oct 2023 18:41:44 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6b8:b081:a512::1:22]) by mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id VfbK2W5OrKo0-emhXSxcY; Fri, 06 Oct 2023 18:41:43 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1696606903; bh=wTcyjx92aXx2sVGdLGZxJJJod8uOvmF/D/xvuHmRDF0=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=f++/vqsvqZat4l9E5JILC6JX150dHweAoiBwcz0ki12HqL6qovGoYXwPU3dbpnJ82 5y/+pMXjnIEcTShhksHFgkmPg0GEbtXjkOet8t36JUtK2ygWrbD37Z00heo0UHFwZf PIMvS4RIKekcMDFh14jTOx+xmkCzvL+r2taSeleo= Authentication-Results: mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru, jsnow@redhat.com, crosa@redhat.com, kwolf@redhat.com, hreitz@redhat.com, eblake@redhat.com, Beraldo Leal Subject: [PATCH v7 02/15] qmp_shell.py: _fill_completion() use .command() instead of .cmd() Date: Fri, 6 Oct 2023 18:41:12 +0300 Message-Id: <20231006154125.1068348-3-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231006154125.1068348-1-vsementsov@yandex-team.ru> References: <20231006154125.1068348-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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=2a02:6b8:c03:500:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1c.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 @yandex-team.ru) X-ZM-MESSAGEID: 1696607026475100001 Content-Type: text/plain; charset="utf-8" We just want to ignore failure, so we don't need low level .cmd(). This helps further renaming .command() to .cmd(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- python/qemu/qmp/qmp_shell.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/python/qemu/qmp/qmp_shell.py b/python/qemu/qmp/qmp_shell.py index 619ab42ced..988d79c01b 100644 --- a/python/qemu/qmp/qmp_shell.py +++ b/python/qemu/qmp/qmp_shell.py @@ -91,14 +91,21 @@ import sys from typing import ( IO, + Dict, Iterator, List, NoReturn, Optional, Sequence, + cast, ) =20 -from qemu.qmp import ConnectError, QMPError, SocketAddrT +from qemu.qmp import ( + ConnectError, + ExecuteError, + QMPError, + SocketAddrT, +) from qemu.qmp.legacy import ( QEMUMonitorProtocol, QMPBadPortError, @@ -194,11 +201,12 @@ def close(self) -> None: super().close() =20 def _fill_completion(self) -> None: - cmds =3D self.cmd('query-commands') - if 'error' in cmds: - return - for cmd in cmds['return']: - self._completer.append(cmd['name']) + try: + cmds =3D cast(List[Dict[str, str]], self.command('query-comman= ds')) + for cmd in cmds: + self._completer.append(cmd['name']) + except ExecuteError: + pass =20 def _completer_setup(self) -> None: self._completer =3D QMPCompleter() --=20 2.34.1