Eric Blake <ebl...@redhat.com> writes: > We have two issues with our qapi union layout: > 1) Even though the QMP wire format spells the tag 'type', the > C code spells it 'kind', requiring some hacks in the generator. > 2) The C struct uses an anonymous union, which places all tag > values in the same namespace as all non-variant members. This > leads to spurious collisions if a tag value matches a QMP name. > > Make the conversion to the new layout for TPM-related code. > > Signed-off-by: Eric Blake <ebl...@redhat.com>
PATCH 08-15 appear to be a purely mechanical switch to u. and from kind to type, except for a qapi.py hunk that looks like it should be in PATCH 07, and a comment update to tests/qapi-schema/union-clash-type.json. Did I miss anything? Combined diffstat isn't so bad: 36 files changed, 393 insertions(+), 394 deletions(-) I've seen worse tree-wide changes, some of them my own. I'd be tempted to squash the complete switch together. But squashing is easy, so we can keep it separate while we review, and decide when we're done.
