From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpGhv-0002sd-1A for qemu-devel@nongnu.org; Thu, 22 Oct 2015 10:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpGhs-0005NW-Ra for qemu-devel@nongnu.org; Thu, 22 Oct 2015 10:19:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpGhs-0005NG-Mj for qemu-devel@nongnu.org; Thu, 22 Oct 2015 10:19:04 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 46F2B19CBB8 for ; Thu, 22 Oct 2015 14:19:04 +0000 (UTC) From: Markus Armbruster References: <1444968943-11254-1-git-send-email-eblake@redhat.com> <1444968943-11254-16-git-send-email-eblake@redhat.com> Date: Thu, 22 Oct 2015 16:19:02 +0200 In-Reply-To: <1444968943-11254-16-git-send-email-eblake@redhat.com> (Eric Blake's message of "Thu, 15 Oct 2015 22:15:40 -0600") Message-ID: <87r3knyoix.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v9 15/17] tpm: Convert to new qapi union layout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Luiz Capitulino Eric Blake 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 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.