From nobody Wed Nov 27 19:42:41 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697224722; cv=none; d=zohomail.com; s=zohoarc; b=UK7jcm/2Omzc9jU/cO6iWPaqhdd9QOgKbaAIpWHVkrw7IUm6vh3RqkMxBkkxnKnILr9l+8wH7o/Tjbd0RGNorseXLImdURHEcRYhtww4oYvKS+d3UkUF46GDN2PG/5HVHWRkFnOmu7l/Dwvt+yBgis0iuV7dosN+L5xfh+TgToo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697224722; 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=l3ZfV/fIoupB5gtPZYjLu0l1bdDmtHuAyzmyVWMACA0=; b=PNG/IcWADGaGdSjsMNoQDjE2cd2S3eLZJko47bUhmsIpTk2c3dJ9Kt5bBq8PqIztlEDjjrSp1SvTmB6G9+rEJvt9KpshOmn7XFXOVrWMFH4RLTy8UGsjoYKC0NJ+msnWNhVkVA+jMVwsHQparJ9mcNse6u4uOjF/Q7A8e3bvlbk= 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 1697224722645737.7426506856516; Fri, 13 Oct 2023 12:18:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrNYj-0007Xo-HL; Fri, 13 Oct 2023 15:10: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 1qrNYS-0007G0-1X for qemu-devel@nongnu.org; Fri, 13 Oct 2023 15:10:37 -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 1qrNYB-0001xQ-PV for qemu-devel@nongnu.org; Fri, 13 Oct 2023 15:10:35 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-67-EgbJ9dRYO66VQWyj2jZQ9w-1; Fri, 13 Oct 2023 15:10:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9064E281294C; Fri, 13 Oct 2023 19:10:14 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.32.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4437140C6CA0; Fri, 13 Oct 2023 19:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697224219; 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=l3ZfV/fIoupB5gtPZYjLu0l1bdDmtHuAyzmyVWMACA0=; b=GRTWXk+Mpp9Bo9lVWdv4PsZ+UINx7iKrO8cbJOu/gwM1i+vC0zhFUOKrV7Q4TRsTSRM510 JOwlGLLDPnh2h3bdEZc30+sPW0j4Df6di/S5u0KMb7BFnGdEmOzGH8bKU/byNY53OtfoXH ud0BnyAmGKdahRvbSUZ0b9vqoI+MD44= X-MC-Unique: EgbJ9dRYO66VQWyj2jZQ9w-1 From: John Snow To: qemu-devel@nongnu.org Cc: Kevin Wolf , Christian Borntraeger , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Vladimir Sementsov-Ogievskiy , Ani Sinha , Thomas Huth , Beraldo Leal , qemu-s390x@nongnu.org, Peter Xu , Peter Maydell , Markus Armbruster , Hanna Reitz , Vladimir Sementsov-Ogievskiy , John Snow , Eric Blake , Aurelien Jarno , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Fabiano Rosas , qemu-block@nongnu.org, Eduardo Habkost , Juan Quintela , Leonardo Bras , Joel Stanley , Paolo Bonzini , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Eric Farman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Cleber Rosa Subject: [PULL 24/25] scripts: add python_qmp_updater.py Date: Fri, 13 Oct 2023 15:09:39 -0400 Message-ID: <20231013190941.3699288-25-jsnow@redhat.com> In-Reply-To: <20231013190941.3699288-1-jsnow@redhat.com> References: <20231013190941.3699288-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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=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, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1697224723527100007 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy A script, to update the pattern result =3D self.vm.qmp(...) self.assert_qmp(result, 'return', {}) (and some similar ones) into self.vm.cmd(...) Used in the next commit "python: use vm.cmd() instead of vm.qmp() where appropriate" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-id: 20231006154125.1068348-15-vsementsov@yandex-team.ru Signed-off-by: John Snow --- scripts/python_qmp_updater.py | 136 ++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100755 scripts/python_qmp_updater.py diff --git a/scripts/python_qmp_updater.py b/scripts/python_qmp_updater.py new file mode 100755 index 0000000000..494a169812 --- /dev/null +++ b/scripts/python_qmp_updater.py @@ -0,0 +1,136 @@ +#!/usr/bin/env python3 +# +# Intended usage: +# +# git grep -l '\.qmp(' | xargs ./scripts/python_qmp_updater.py +# + +import re +import sys +from typing import Optional + +start_reg =3D re.compile(r'^(?P *)(?P\w+) =3D (?P.*).qmp= \(', + flags=3Dre.MULTILINE) + +success_reg_templ =3D re.sub('\n *', '', r""" + (\n*{padding}(?P\#.*$))? + \n*{padding} + ( + self.assert_qmp\({res},\ 'return',\ {{}}\) + | + assert\ {res}\['return'\]\ =3D=3D\ {{}} + | + assert\ {res}\ =3D=3D\ {{'return':\ {{}}}} + | + self.assertEqual\({res}\['return'\],\ {{}}\) + )""") + +some_check_templ =3D re.sub('\n *', '', r""" + (\n*{padding}(?P\#.*$))? + \s*self.assert_qmp\({res},""") + + +def tmatch(template: str, text: str, + padding: str, res: str) -> Optional[re.Match[str]]: + return re.match(template.format(padding=3Dpadding, res=3Dres), text, + flags=3Dre.MULTILINE) + + +def find_closing_brace(text: str, start: int) -> int: + """ + Having '(' at text[start] search for pairing ')' and return its index. + """ + assert text[start] =3D=3D '(' + + height =3D 1 + + for i in range(start + 1, len(text)): + if text[i] =3D=3D '(': + height +=3D 1 + elif text[i] =3D=3D ')': + height -=3D 1 + if height =3D=3D 0: + return i + + raise ValueError + + +def update(text: str) -> str: + result =3D '' + + while True: + m =3D start_reg.search(text) + if m is None: + result +=3D text + break + + result +=3D text[:m.start()] + + args_ind =3D m.end() + args_end =3D find_closing_brace(text, args_ind - 1) + + all_args =3D text[args_ind:args_end].split(',', 1) + + name =3D all_args[0] + args =3D None if len(all_args) =3D=3D 1 else all_args[1] + + unchanged_call =3D text[m.start():args_end+1] + text =3D text[args_end+1:] + + padding, res, vm =3D m.group('padding', 'res', 'vm') + + m =3D tmatch(success_reg_templ, text, padding, res) + + if m is None: + result +=3D unchanged_call + + if ('query-' not in name and + 'x-debug-block-dirty-bitmap-sha256' not in name and + not tmatch(some_check_templ, text, padding, res)): + print(unchanged_call + text[:200] + '...\n\n') + + continue + + if m.group('comment'): + result +=3D f'{padding}{m.group("comment")}\n' + + result +=3D f'{padding}{vm}.cmd({name}' + + if args: + result +=3D ',' + + if '\n' in args: + m_args =3D re.search('(?P *).*$', args) + assert m_args is not None + + cur_padding =3D len(m_args.group('pad')) + expected =3D len(f'{padding}{res} =3D {vm}.qmp(') + drop =3D len(f'{res} =3D ') + if cur_padding =3D=3D expected - 1: + # tolerate this bad style + drop -=3D 1 + elif cur_padding < expected - 1: + # assume nothing to do + drop =3D 0 + + if drop: + args =3D re.sub('\n' + ' ' * drop, '\n', args) + + result +=3D args + + result +=3D ')' + + text =3D text[m.end():] + + return result + + +for fname in sys.argv[1:]: + print(fname) + with open(fname) as f: + t =3D f.read() + + t =3D update(t) + + with open(fname, 'w') as f: + f.write(t) --=20 2.41.0