Skip to content

qapi: allow unions to contain further unions

Daniel P. Berrangé qemu-devel 3 versions – Applied

Status from this message: Queued. Thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest3 patches 6 repliesApplied
  2. v23 patches 9 repliesSuperseded
  3. v11 patch 2 repliesSuperseded

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/3qapi: support updating expected test output via maketests/qapi-schema/test-qapi.py+1 -01 reply
2/3qapi: improve specificity of type/member descriptionsscripts/qapi/schema.py+7 -24 replies
3/3qapi: allow unions to contain further unionsscripts/qapi/schema.py tests/qapi-schema/meson.build tests/qapi-schema/qapi-schema-test.json +9 more+234 -30 replies

Reviews trailers per patch

2 of 3 patches have a Reviewed-by or Acked-by.

PatchMarkus Armbruster
1/3R-b
2/3
3/3R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/3] qapi: allow unions to contain further unions

Currently it is not possible for a union type to contain a further union as one (or more) of its branches. This relaxes that restriction and adds the calls needed to validate field name uniqueness as unions are flattened.

In v3:

* Use markus' suggestion for improved error messages
* Set env var default in argparse directly

In v2:

* Improve specificity of type/members descriptions for error reporting scenarios
* Make it easier to regenerate qapi test output
* Move expected "good data" into qapi-schema-test.json
* Add description to "bad data" test files
* Add unit tests to cover union-in-union serialization / deserialization to/from JSON

Daniel P. Berrangé (3):
qapi: support updating expected test output via make
qapi: improve specificity of type/member descriptions
qapi: allow unions to contain further unions

 scripts/qapi/schema.py                        | 15 +++--
 tests/qapi-schema/meson.build                 |  2 +
 tests/qapi-schema/qapi-schema-test.json       | 32 ++++++++++
 tests/qapi-schema/qapi-schema-test.out        | 29 ++++++++++
 tests/qapi-schema/test-qapi.py                |  1 +
 .../union-invalid-union-subfield.err          |  2 +
 .../union-invalid-union-subfield.json         | 30 ++++++++++
 .../union-invalid-union-subfield.out          |  0
 .../union-invalid-union-subtype.err           |  2 +
 .../union-invalid-union-subtype.json          | 29 ++++++++++
 .../union-invalid-union-subtype.out           |  0
 tests/unit/test-qobject-input-visitor.c       | 47 +++++++++++++++
 tests/unit/test-qobject-output-visitor.c      | 58 +++++++++++++++++++
 13 files changed, 242 insertions(+), 5 deletions(-)
 create mode 100644 tests/qapi-schema/union-invalid-union-subfield.err
 create mode 100644 tests/qapi-schema/union-invalid-union-subfield.json
 create mode 100644 tests/qapi-schema/union-invalid-union-subfield.out
 create mode 100644 tests/qapi-schema/union-invalid-union-subtype.err
 create mode 100644 tests/qapi-schema/union-invalid-union-subtype.json
 create mode 100644 tests/qapi-schema/union-invalid-union-subtype.out
Signature · 1 line
2.40.0