From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org, Eric Blake <eblake@redhat.com>
Subject: [PULL 03/17] qapi: Clean up after removal of simple unions
Date: Wed, 26 Apr 2023 07:57:30 +0200 [thread overview]
Message-ID: <20230426055744.1041930-4-armbru@redhat.com> (raw)
In-Reply-To: <20230426055744.1041930-1-armbru@redhat.com>
Commit 4e99f4b12c0 (qapi: Drop simple unions) missed a bit of code
dealing with simple union branches. Drop it.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-4-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/qapi/expr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index ca01ea6f4a..59bdd86024 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -518,7 +518,7 @@ def check_union(expr: QAPIExpression) -> None:
source = "'data' member '%s'" % key
check_keys(value, info, source, ['type'], ['if'])
check_if(value, info, source)
- check_type(value['type'], info, source, allow_array=not base)
+ check_type(value['type'], info, source)
def check_alternate(expr: QAPIExpression) -> None:
--
2.39.2
next prev parent reply other threads:[~2023-04-26 5:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-26 5:57 [PULL 00/17] QAPI patches patches for 2023-04-26 Markus Armbruster
2023-04-26 5:57 ` [PULL 01/17] qapi: Fix error message format regression Markus Armbruster
2023-04-26 5:57 ` [PULL 02/17] qapi/schema: Use super() Markus Armbruster
2023-04-26 5:57 ` Markus Armbruster [this message]
2023-04-26 5:57 ` [PULL 04/17] qapi: Split up check_type() Markus Armbruster
2023-04-26 5:57 ` [PULL 05/17] qapi: Improve error message for unexpected array types Markus Armbruster
2023-04-26 5:57 ` [PULL 06/17] qapi: Simplify code a bit after previous commits Markus Armbruster
2023-04-26 5:57 ` [PULL 07/17] qapi: Fix error message when type name or array is expected Markus Armbruster
2023-04-26 5:57 ` [PULL 08/17] qapi: Fix to reject 'data': 'mumble' in struct Markus Armbruster
2023-04-26 5:57 ` [PULL 09/17] tests/qapi-schema: Improve union discriminator coverage Markus Armbruster
2023-04-26 5:57 ` [PULL 10/17] tests/qapi-schema: Rename a few conditionals Markus Armbruster
2023-04-26 5:57 ` [PULL 11/17] tests/qapi-schema: Clean up positive test for conditionals Markus Armbruster
2023-04-26 5:57 ` [PULL 12/17] tests/qapi-schema: Cover optional conditional struct member Markus Armbruster
2023-04-26 5:57 ` [PULL 13/17] qapi: Fix code generated for " Markus Armbruster
2023-04-26 5:57 ` [PULL 14/17] qapi: Require boxed for conditional command and event arguments Markus Armbruster
2023-04-26 5:57 ` [PULL 15/17] qapi: support updating expected test output via make Markus Armbruster
2023-04-26 5:57 ` [PULL 16/17] qapi: Improve specificity of type/member descriptions Markus Armbruster
2023-04-26 5:57 ` [PULL 17/17] qapi: allow unions to contain further unions Markus Armbruster
2023-04-26 11:07 ` [PULL 00/17] QAPI patches patches for 2023-04-26 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230426055744.1041930-4-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).