Re: [Qemu-devel] [PATCH v9 15/17] tpm: Convert to new qapi union layout

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]

On 10/22/2015 08:19 AM, Markus Armbruster wrote:
> Eric Blake <eblake@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 <eblake@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(-)

It already needs a rebase; some of Dan's work has caused more changes to
ui/vnc.c and util/qemu-sockets.c.  So hopefully I post v10 soon.

> 
> 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.

Sure, v10 will keep things separate, but squashing won't hurt too much.
 After all, v5 had it all as one patch.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]