From patchwork Tue Mar 23 09:39:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 1457116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DGYlBr4e; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F4RFg4RHbz9sRR for ; Tue, 23 Mar 2021 20:41:10 +1100 (AEDT) Received: from localhost ([::1]:47934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOdX9-0001Ho-BU for incoming@patchwork.ozlabs.org; Tue, 23 Mar 2021 05:41:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOdWe-0001HY-RL for qemu-devel@nongnu.org; Tue, 23 Mar 2021 05:40:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOdWc-0001xb-F3 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 05:40:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616492433; 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; bh=qBj/ROlUzuY9gPl02K7ukaLPHs7sDD7mYS+zE5MMvJI=; b=DGYlBr4enTwX/y3kXaEDXpMYB8DVFj+yMvJaZ+6IEFCpxEFvNo/B8y++5Y9IyNtEp45CGM 3mDU82NVdkyts2wCk1X9cgl3Qwz/yd2UUN0EMT/Qqv4us8Mmvacs958h9ApJjBZlXLqDAC xXr6JUChO6UYPZN04665/1LfI/rAy2U= 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-271-N-RVsQyZNBCgb2vQwh7HPA-1; Tue, 23 Mar 2021 05:40:31 -0400 X-MC-Unique: N-RVsQyZNBCgb2vQwh7HPA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9735B9CC02; Tue, 23 Mar 2021 09:40:30 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-17.ams2.redhat.com [10.36.114.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F49D60BE5; Tue, 23 Mar 2021 09:40:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A7FA411327E1; Tue, 23 Mar 2021 10:40:25 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 00/28] qapi: Enforce naming rules Date: Tue, 23 Mar 2021 10:39:57 +0100 Message-Id: <20210323094025.3569441-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_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: jsnow@redhat.com, michael.roth@amd.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This will save us pointless review - fix up cycles. We should've done it long ago. The whole series could be considered bug fixes. Not particularly urgent ones, though. Options: * Take them all. * Take PATCH 01-07 now, queue the rest for 6.1. * Queue all for 6.1. Let me know your preferences. Markus Armbruster (28): qapi/pragma: Tidy up after removal of deprecated commands tests/qapi-schema: Drop redundant flat-union-inline test tests/qapi-schema: Rework comments on longhand member definitions tests/qapi-schema: Belatedly update comment on alternate clash tests/qapi-schema: Drop TODO comment on simple unions tests/qapi-schema: Tweak to demonstrate buggy member name check qapi: Fix to reject optional members with reserved names qapi: Support flat unions tag values with leading digit qapi: Lift enum-specific code out of check_name_str() qapi: Rework name checking in preparation of stricter checking qapi: Move uppercase rejection to check_name_lower() qapi: Consistently permit any case in downstream prefixes qapi: Enforce event naming rules qapi: Enforce type naming rules tests/qapi-schema: Rename redefined-builtin to redefined-predefined qapi: Factor out QAPISchemaParser._check_pragma_list_of_str() tests/qapi-schema: Rename pragma-*-crap to pragma-value-not-* tests/qapi-schema: Rename returns-whitelist to returns-bad-type qapi: Rename pragma *-whitelist to *-exceptions qapi/pragma: Streamline comments on member-name-exceptions tests-qmp-cmds: Drop unused and incorrect qmp_TestIfCmd() qapi: Prepare for rejecting underscore in command and member names qapi: Enforce feature naming rules qapi: Enforce command naming rules tests/qapi-schema: Switch member name clash test to struct qapi: Enforce struct member naming rules qapi: Enforce enum member naming rules qapi: Enforce union and alternate branch naming rules docs/devel/qapi-code-gen.txt | 28 +++--- qapi/pragma.json | 65 ++++++++++--- qga/qapi-schema.json | 6 +- tests/unit/test-qmp-cmds.c | 17 +--- tests/unit/test-qmp-event.c | 6 +- scripts/qapi/common.py | 8 +- scripts/qapi/expr.py | 94 ++++++++++++------- scripts/qapi/parser.py | 30 +++--- scripts/qapi/schema.py | 2 +- scripts/qapi/source.py | 10 +- tests/qapi-schema/alternate-clash.err | 2 +- tests/qapi-schema/alternate-clash.json | 9 +- tests/qapi-schema/args-member-case.err | 2 +- tests/qapi-schema/args-name-clash.err | 2 - tests/qapi-schema/args-name-clash.json | 4 - tests/qapi-schema/doc-bad-union-member.json | 4 +- tests/qapi-schema/doc-good.json | 4 +- tests/qapi-schema/doc-good.out | 4 +- tests/qapi-schema/doc-good.txt | 2 +- tests/qapi-schema/doc-invalid-return.json | 4 +- tests/qapi-schema/double-type.err | 2 +- tests/qapi-schema/double-type.json | 2 +- tests/qapi-schema/enum-clash-member.err | 2 +- tests/qapi-schema/enum-clash-member.json | 1 + tests/qapi-schema/enum-member-case.err | 2 +- tests/qapi-schema/enum-member-case.json | 2 +- tests/qapi-schema/event-case.err | 2 + tests/qapi-schema/event-case.json | 2 - tests/qapi-schema/event-case.out | 14 --- .../qapi-schema/event-member-invalid-dict.err | 2 +- .../event-member-invalid-dict.json | 2 + .../qapi-schema/features-deprecated-type.err | 2 +- .../qapi-schema/features-deprecated-type.json | 2 +- .../flat-union-inline-invalid-dict.json | 4 +- tests/qapi-schema/flat-union-inline.err | 2 - tests/qapi-schema/flat-union-inline.json | 11 --- tests/qapi-schema/flat-union-no-base.err | 2 +- tests/qapi-schema/flat-union-no-base.json | 1 - tests/qapi-schema/meson.build | 14 +-- .../nested-struct-data-invalid-dict.err | 2 +- .../nested-struct-data-invalid-dict.json | 3 +- tests/qapi-schema/nested-struct-data.json | 2 +- .../qapi-schema/pragma-doc-required-crap.err | 1 - .../pragma-name-case-whitelist-crap.err | 1 - .../pragma-name-case-whitelist-crap.json | 3 - .../pragma-returns-whitelist-crap.err | 1 - .../pragma-returns-whitelist-crap.json | 3 - tests/qapi-schema/pragma-value-not-bool.err | 1 + ...d-crap.json => pragma-value-not-bool.json} | 2 +- ...me-clash.out => pragma-value-not-bool.out} | 0 .../pragma-value-not-list-of-str.err | 1 + .../pragma-value-not-list-of-str.json | 3 + ...e.out => pragma-value-not-list-of-str.out} | 0 tests/qapi-schema/pragma-value-not-list.err | 1 + tests/qapi-schema/pragma-value-not-list.json | 2 + ...red-crap.out => pragma-value-not-list.out} | 0 tests/qapi-schema/qapi-schema-test.json | 35 ++++--- tests/qapi-schema/qapi-schema-test.out | 42 ++++----- tests/qapi-schema/redefined-builtin.err | 2 - tests/qapi-schema/redefined-builtin.json | 2 - tests/qapi-schema/redefined-predefined.err | 2 + tests/qapi-schema/redefined-predefined.json | 2 + ...list-crap.out => redefined-predefined.out} | 0 tests/qapi-schema/redefined-type.err | 6 +- tests/qapi-schema/redefined-type.json | 4 +- tests/qapi-schema/reserved-member-u.err | 2 +- tests/qapi-schema/reserved-member-u.json | 2 +- tests/qapi-schema/returns-bad-type.err | 2 + ...s-whitelist.json => returns-bad-type.json} | 2 +- ...hitelist-crap.out => returns-bad-type.out} | 0 tests/qapi-schema/returns-whitelist.err | 2 - tests/qapi-schema/struct-data-invalid.err | 2 +- tests/qapi-schema/struct-data-invalid.json | 2 +- .../struct-member-invalid-dict.err | 4 +- .../struct-member-invalid-dict.json | 5 +- tests/qapi-schema/struct-member-invalid.err | 2 +- tests/qapi-schema/struct-member-invalid.json | 2 +- .../qapi-schema/struct-member-name-clash.err | 2 + .../qapi-schema/struct-member-name-clash.json | 5 + ...iltin.out => struct-member-name-clash.out} | 0 tests/qapi-schema/type-case.err | 2 + tests/qapi-schema/type-case.json | 2 + .../{returns-whitelist.out => type-case.out} | 0 tests/qapi-schema/union-branch-case.err | 2 +- tests/qapi-schema/union-clash-branches.err | 2 +- tests/qapi-schema/union-clash-branches.json | 6 +- tests/qapi-schema/unknown-expr-key.err | 2 +- tests/qapi-schema/unknown-expr-key.json | 2 +- 88 files changed, 306 insertions(+), 241 deletions(-) delete mode 100644 tests/qapi-schema/args-name-clash.err delete mode 100644 tests/qapi-schema/args-name-clash.json delete mode 100644 tests/qapi-schema/flat-union-inline.err delete mode 100644 tests/qapi-schema/flat-union-inline.json delete mode 100644 tests/qapi-schema/pragma-doc-required-crap.err delete mode 100644 tests/qapi-schema/pragma-name-case-whitelist-crap.err delete mode 100644 tests/qapi-schema/pragma-name-case-whitelist-crap.json delete mode 100644 tests/qapi-schema/pragma-returns-whitelist-crap.err delete mode 100644 tests/qapi-schema/pragma-returns-whitelist-crap.json create mode 100644 tests/qapi-schema/pragma-value-not-bool.err rename tests/qapi-schema/{pragma-doc-required-crap.json => pragma-value-not-bool.json} (55%) rename tests/qapi-schema/{args-name-clash.out => pragma-value-not-bool.out} (100%) create mode 100644 tests/qapi-schema/pragma-value-not-list-of-str.err create mode 100644 tests/qapi-schema/pragma-value-not-list-of-str.json rename tests/qapi-schema/{flat-union-inline.out => pragma-value-not-list-of-str.out} (100%) create mode 100644 tests/qapi-schema/pragma-value-not-list.err create mode 100644 tests/qapi-schema/pragma-value-not-list.json rename tests/qapi-schema/{pragma-doc-required-crap.out => pragma-value-not-list.out} (100%) delete mode 100644 tests/qapi-schema/redefined-builtin.err delete mode 100644 tests/qapi-schema/redefined-builtin.json create mode 100644 tests/qapi-schema/redefined-predefined.err create mode 100644 tests/qapi-schema/redefined-predefined.json rename tests/qapi-schema/{pragma-name-case-whitelist-crap.out => redefined-predefined.out} (100%) create mode 100644 tests/qapi-schema/returns-bad-type.err rename tests/qapi-schema/{returns-whitelist.json => returns-bad-type.json} (91%) rename tests/qapi-schema/{pragma-returns-whitelist-crap.out => returns-bad-type.out} (100%) delete mode 100644 tests/qapi-schema/returns-whitelist.err create mode 100644 tests/qapi-schema/struct-member-name-clash.err create mode 100644 tests/qapi-schema/struct-member-name-clash.json rename tests/qapi-schema/{redefined-builtin.out => struct-member-name-clash.out} (100%) create mode 100644 tests/qapi-schema/type-case.err create mode 100644 tests/qapi-schema/type-case.json rename tests/qapi-schema/{returns-whitelist.out => type-case.out} (100%)