From nobody Thu Apr 3 09:54:53 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1742401776; cv=none; d=zohomail.com; s=zohoarc; b=RXLdy7C7ecxmav0lSWKpCORk/pUsmZz7cVlIg4GTOWIARjmZAAdXIWdR/eguqiS+YqXbJYWKTqoE29LKTQLFswxEWRlorNYEGabIUR51O7MRUjBUSgWGF4eej72HWTrUJmAiA42MFK3sQJCHobGTZZWezd0440Vw8gU62zAoTiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742401776; h=Content-Type: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=Ldx0piybqUILZ+q26+wafghVoHtgoMwecCWubBVXrAc=; b=VXlWT8MQ7N289i+YTGRtAlM3nKpIiYw1EWaxVMplugQgmd45oCREIC7py+71c65G+Y2jfBZ6LdXPLPW/gwjJZqGyClPUMJAtB6C1DkyaXkzMdAUKYtbGjO9+QectbDu3QKza9NS0ixnpJhZZkp2fP2GdfwyWDbY34ZlsA1chAmc= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742401776477497.5551074676067; Wed, 19 Mar 2025 09:29:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwHY-00071j-JY; Wed, 19 Mar 2025 12:28:40 -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 1tuwHM-0006xu-M3 for qemu-devel@nongnu.org; Wed, 19 Mar 2025 12:28:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwHG-0001yu-0e for qemu-devel@nongnu.org; Wed, 19 Mar 2025 12:28:28 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-100-hWCLa-ciNtuVX_BbfSl9ow-1; Wed, 19 Mar 2025 12:28:17 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CB77D1955DCF; Wed, 19 Mar 2025 16:28:15 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.6]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B691B180175E; Wed, 19 Mar 2025 16:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742401699; 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=Ldx0piybqUILZ+q26+wafghVoHtgoMwecCWubBVXrAc=; b=DQrtu/a0RyjzJ5jajXUs25D7sBk4eUfMEYYZF3JzGszmZHzlYZ/ly6IFgvF6E7+OJflDgz uGhrerBo3CvklH0WYKx6sJID8S3mPP+x6GKW2aXPZKTfLMCSFOmtehweeNzrXAiD+lL7K3 mJC5c52HvUulx64VX0alRx4PbmkVOi0= X-MC-Unique: hWCLa-ciNtuVX_BbfSl9ow-1 X-Mimecast-MFC-AGG-ID: hWCLa-ciNtuVX_BbfSl9ow_1742401697 From: Peter Krempa To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , qemu-block@nongnu.org, Pavel Hrdina Subject: [PATCH v2 1/3] scripts: render_block_graph: Fix invalid escape sequence warning with python 3.12 Date: Wed, 19 Mar 2025 17:28:07 +0100 Message-ID: <8e38cc4aff81cfec21cc26e9dbb646c5d8fcabd6.1742401551.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=pkrempa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.337, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1742401778007019000 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Trying to run 'render_block_graph' produces following warnings on machine with python 3.12: $ ./scripts/render_block_graph.py cd-throttle ble.png ./scripts/render_block_graph.py:57: SyntaxWarning: invalid escape sequence= '\l' ' w - Write\l' ./scripts/render_block_graph.py:58: SyntaxWarning: invalid escape sequence= '\l' ' r - consistent-Read\l' ./scripts/render_block_graph.py:59: SyntaxWarning: invalid escape sequence= '\l' ' u - write - Unchanged\l' ./scripts/render_block_graph.py:60: SyntaxWarning: invalid escape sequence= '\l' [...] The graphviz '\l' escape sequence is used to left-justify the line and new python started enforcing of strings to contain only known escape sequences. Convert the strings containing the dot language to raw. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- scripts/render_block_graph.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index 3e1a2e3fa7..14b2d02ec2 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -53,16 +53,16 @@ def render_block_graph(qmp, filename, format=3D'png'): graph =3D Digraph(comment=3D'Block Nodes Graph') graph.format =3D format - graph.node('permission symbols:\l' - ' w - Write\l' - ' r - consistent-Read\l' - ' u - write - Unchanged\l' - ' g - Graph-mod\l' - ' s - reSize\l' - 'edge label scheme:\l' - ' \l' - ' \l' - ' \l', shape=3D'none') + graph.node(r'permission symbols:\l' + r' w - Write\l' + r' r - consistent-Read\l' + r' u - write - Unchanged\l' + r' g - Graph-mod\l' + r' s - reSize\l' + r'edge label scheme:\l' + r' \l' + r' \l' + r' \l', shape=3D'none') for n in block_graph['nodes']: if n['type'] =3D=3D 'block-driver': @@ -83,8 +83,8 @@ def render_block_graph(qmp, filename, format=3D'png'): graph.node(str(n['id']), label, shape=3Dshape) for e in block_graph['edges']: - label =3D '%s\l%s\l%s\l' % (e['name'], perm(e['perm']), - perm(e['shared-perm'])) + label =3D r'%s\l%s\l%s\l' % (e['name'], perm(e['perm']), + perm(e['shared-perm'])) graph.edge(str(e['parent']), str(e['child']), label=3Dlabel) graph.render(filename) --=20 2.48.1 From nobody Thu Apr 3 09:54:53 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1742401754; cv=none; d=zohomail.com; s=zohoarc; b=dps0sMf7cM1djogq+JPyEzlO+uP9bshAdyG0U1kG6wa5f90T8qrRRiZoaFwRrgO3w61dRdCcJX1176N3Hdgo9MHMF/4AABElMkHN0f0F6YVw+jlQS9zVZP39Nzc8dRrQa5NjAMaj5yZ0Od6N+3XeM7wm7UIF21gmnff8c3pmf24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742401754; h=Content-Type: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=NhIyTkJ9ye6lnrgBf09wrXhQzG2y8GEvxS/m0QpXpAg=; b=R+sQy19ze/wVVQ8WiO4U12hPvdtr5gRQL7Gg4mR/r5zQA84K7lj1Vr0yALJYA8P2ypKCw/M5oIH99xlEplJsycVosbcPoHa3V2fSjPZvtm4b+Cs33S8gGVJ9v1myLtqNvWPOwE5HLkYCDExPBI2q8On1SBXI3pfpNZ6VisLz0xo= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742401754666563.1778300334222; Wed, 19 Mar 2025 09:29:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwHY-00071o-Up; Wed, 19 Mar 2025 12:28:40 -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 1tuwHL-0006xE-U0 for qemu-devel@nongnu.org; Wed, 19 Mar 2025 12:28:30 -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 1tuwHH-000247-Mg for qemu-devel@nongnu.org; Wed, 19 Mar 2025 12:28:25 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-527-bccPBClzNU25YLZQTSmHew-1; Wed, 19 Mar 2025 12:28:19 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5958B180AF4E; Wed, 19 Mar 2025 16:28:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.6]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5660918001D4; Wed, 19 Mar 2025 16:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742401701; 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=NhIyTkJ9ye6lnrgBf09wrXhQzG2y8GEvxS/m0QpXpAg=; b=MQUUde9oiSLFJMiGAvlSIrh4G+m0h1CrSTq8JrQ1Jb/0dzNp5QP2pxkrU4U6DiIfG1YgSt jyopvjjjPBwvQrQkB+WkVr7+kWrO3Ktq0GdsXTdkau3u1h/yjzOOL/Ow8o224uELJUljCd zQHarfSGPN2hae20wZpr9HRO0NC4oBc= X-MC-Unique: bccPBClzNU25YLZQTSmHew-1 X-Mimecast-MFC-AGG-ID: bccPBClzNU25YLZQTSmHew_1742401698 From: Peter Krempa To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , qemu-block@nongnu.org, Pavel Hrdina Subject: [PATCH v2 2/3] scripts: render_block_graph: Implement proper argument parser Date: Wed, 19 Mar 2025 17:28:08 +0100 Message-ID: <2b58fa2362963d6a6e58fcfdb10d5e058a15cfd7.1742401551.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=pkrempa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.337, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1742401757808019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa As no argument parsing is employed the script is hard to use and when running without arguments it blurbs: $ ./scripts/render_block_graph.py Traceback (most recent call last): File "/home/pipo/git/qemu.git/./scripts/render_block_graph.py", line 135= , in obj =3D sys.argv[1] ~~~~~~~~^^^ IndexError: list index out of range instead of an actionable error. The user then usually needs to read the script to understand arguments. Implement proper argument parsing via 'argparse'. The following arguments will be supported: $ ./scripts/render_block_graph.py --help usage: render_block_graph.py [-h] (--socket SOCKET | --vm VM) [--uri URI]= [--output OUTPUT] Tool that renders the qemu block graph into a image. options: -h, --help show this help message and exit --socket SOCKET socket mode - path to qemu monitor socket --vm VM libvirt mode - name of libvirt VM --uri URI libvirt URI to connect to --output OUTPUT path to output image (.png suffix added); in libvirt m= ode default is the name of the VM Usage then requires one of '--vm' or '--socket'. In libvirt mode the output file is by default populated from the VM name and the '--uri' parameter allows overriding the libvirt connection uri. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- scripts/render_block_graph.py | 51 ++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index 14b2d02ec2..6f668dec51 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -23,6 +23,7 @@ import subprocess import json from graphviz import Digraph +import argparse sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) from qemu.qmp import QMPError @@ -91,13 +92,19 @@ def render_block_graph(qmp, filename, format=3D'png'): class LibvirtGuest(): - def __init__(self, name): + def __init__(self, name, uri=3DNone): self.name =3D name + self.uri =3D uri def cmd(self, cmd): # only supports qmp commands without parameters m =3D {'execute': cmd} - ar =3D ['virsh', 'qemu-monitor-command', self.name, json.dumps(m)] + ar =3D ['virsh'] + + if self.uri: + ar +=3D ['-c', self.uri] + + ar +=3D ['qemu-monitor-command', self.name, json.dumps(m)] reply =3D json.loads(subprocess.check_output(ar)) @@ -108,15 +115,39 @@ def cmd(self, cmd): if __name__ =3D=3D '__main__': - obj =3D sys.argv[1] - out =3D sys.argv[2] + parser =3D argparse.ArgumentParser( + description=3D'Tool that renders the qemu block graph into a i= mage.') + + modegroup =3D parser.add_mutually_exclusive_group(required=3DTrue) + + modegroup.add_argument('--socket', + help=3D'socket mode - path to qemu monitor sock= et') + modegroup.add_argument('--vm', help=3D'libvirt mode - name of libvirt = VM') + + parser.add_argument('--uri', help=3D'libvirt URI to connect to') + + parser.add_argument('--output', + help=3D'path to output image (.png suffix added); ' + 'in libvirt mode default is the name of the V= M') - if os.path.exists(obj): - # assume unix socket - qmp =3D QEMUMonitorProtocol(obj) + args =3D parser.parse_args() + + if args.socket: + if not args.output: + print("--output required in socket mode", file=3Dsys.stderr) + parser.print_usage() + sys.exit(1) + + qmp =3D QEMUMonitorProtocol(args.socket) qmp.connect() - else: - # assume libvirt guest name - qmp =3D LibvirtGuest(obj) + out =3D args.output + + if args.vm: + qmp =3D LibvirtGuest(args.vm, args.uri) + + if args.output: + out =3D args.output + else: + out =3D args.vm render_block_graph(qmp, out) --=20 2.48.1 From nobody Thu Apr 3 09:54:53 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1742401753; cv=none; d=zohomail.com; s=zohoarc; b=ZD2DBk3B6LGrlYGDIUKwsXnue/EOZYl8JGnMvgU/vUsux21yeZY2l6kmzE/rQrHsnUGe3TtRkCMMNcrgmpRUHMhQ2K3uR18Ov/tIRlVFc+wQMSyxh4VO/r+8ARrVO0PZk93sHUlTZoOXh34El6n1qwKjkA+t5zAY1co6WNnCuew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742401753; h=Content-Type: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=IL0VXRjpyTvkmdCK6M/T5I1ZxCkjFirYEe1Pxoa76DM=; b=PoLkOHwABSFnrGmamci2EYFr5S242eEn6uokY0IXNtUPBih0B33gzdteu8vhWypZuRliVDHGXpnvMtLv388K7AiE+AVc0Mp9YrRQr0qIOvS99Z+7ELZh3WwvnuxcXabCmgsk5aDKHTklQL9ayKeRArsD+hFOfjceS+fwcD8EWmg= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742401753004491.80039364080017; Wed, 19 Mar 2025 09:29:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwHa-00073E-BR; Wed, 19 Mar 2025 12:28:42 -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 1tuwHQ-0006yC-FJ for qemu-devel@nongnu.org; Wed, 19 Mar 2025 12:28:34 -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 1tuwHJ-00028s-3Z for qemu-devel@nongnu.org; Wed, 19 Mar 2025 12:28:32 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-185-D5X5mIZLNhWVFlJ_7coi-w-1; Wed, 19 Mar 2025 12:28:21 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D427A195608A; Wed, 19 Mar 2025 16:28:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.6]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D2B7218001D4; Wed, 19 Mar 2025 16:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742401703; 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=IL0VXRjpyTvkmdCK6M/T5I1ZxCkjFirYEe1Pxoa76DM=; b=F/IRB1Ax1Q1X6GNXi2Mz/V/HZoKw0/IoEGz0BVCuZr15OSGXa7KRI/mPE/onnnrc3wGQtn lOVG9kK5QqM/QCcBSY7eDiVOnFmO8b4n5SRm6j8yv10xS09QC1Px2zDyuGQA6ZPrqTo8wt eR1W5VCL4fVuRa6C0kVY81VGF+eZ7fA= X-MC-Unique: D5X5mIZLNhWVFlJ_7coi-w-1 X-Mimecast-MFC-AGG-ID: D5X5mIZLNhWVFlJ_7coi-w_1742401700 From: Peter Krempa To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , qemu-block@nongnu.org, Pavel Hrdina Subject: [PATCH v2 3/3] scripts: render_block_graph: Avoid backtrace on error from virsh Date: Wed, 19 Mar 2025 17:28:09 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=pkrempa@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, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1742401755108019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa An error from virsh spews also backtrace: $ ./scripts/render_block_graph.py --vm doesnotexist error: failed to get domain 'doesnotexist' Traceback (most recent call last): File "/home/pipo/git/qemu.git/./scripts/render_block_graph.py", line 15= 2, in render_block_graph(qmp, out) ~~~~~~~~~~~~~~~~~~^^^^^^^^^^ File "/home/pipo/git/qemu.git/./scripts/render_block_graph.py", line 47= , in render_block_graph [snipped] instead of just the important bits: $ ./scripts/render_block_graph.py --vm doesnotexist error: failed to get domain 'doesnotexist' Catch the exception and exit. 'virsh' already printed the error. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- scripts/render_block_graph.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index 6f668dec51..3bfc751caa 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -106,7 +106,10 @@ def cmd(self, cmd): ar +=3D ['qemu-monitor-command', self.name, json.dumps(m)] - reply =3D json.loads(subprocess.check_output(ar)) + try: + reply =3D json.loads(subprocess.check_output(ar)) + except subprocess.CalledProcessError: + sys.exit(1) if 'error' in reply: raise QMPError(reply) --=20 2.48.1