From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 478DDC433F5 for ; Mon, 13 Sep 2021 18:44:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB184610D2 for ; Mon, 13 Sep 2021 18:44:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EB184610D2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:41686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPqw8-0007gL-2h for qemu-devel@archiver.kernel.org; Mon, 13 Sep 2021 14:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPqrA-0002Jw-It for qemu-devel@nongnu.org; Mon, 13 Sep 2021 14:39:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPqr7-00021W-72 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 14:39:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631558339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QfkwP/ehtJMZxpIu0k74y7/IQAqo3eEoEpKU/g+9Chc=; b=E7yHHg8i1dPj2qsoBQSkn8unRClv5PfKqzF2/tdZJ0kLdIjBh3FeXovq/hJCCNGESWiCXf JzAV/4CIeszEPVqS0GhTpkaD1Ck1LOBNeK3oxfK+SIhMSwy+JYiJ6QikojXlKYVkzb1SR4 EHUmFwOso5TsLZRy8zmHoyiFiwatBEc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-468-qVN0jeQTNOqjbH4r9xl6bQ-1; Mon, 13 Sep 2021 14:38:57 -0400 X-MC-Unique: qVN0jeQTNOqjbH4r9xl6bQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1DE3D362FB for ; Mon, 13 Sep 2021 18:38:57 +0000 (UTC) Received: from redhat.com (ovpn-113-222.phx2.redhat.com [10.3.113.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC35C5D9D3; Mon, 13 Sep 2021 18:38:51 +0000 (UTC) Date: Mon, 13 Sep 2021 13:38:50 -0500 From: Eric Blake To: Markus Armbruster Subject: Re: [PATCH 21/22] qapi: Drop simple unions Message-ID: <20210913183850.6sfxrf7cvqrgvqm5@redhat.com> References: <20210913123932.3306639-1-armbru@redhat.com> <20210913123932.3306639-22-armbru@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210913123932.3306639-22-armbru@redhat.com> User-Agent: NeoMutt/20210205-772-2b4c52 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.398, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, jsnow@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Sep 13, 2021 at 02:39:31PM +0200, Markus Armbruster wrote: > Simple unions predate flat unions. Having both complicates the QAPI > schema language and the QAPI generator. We haven't been using simple > unions in new code for a long time, because they are less flexible and > somewhat awkward on the wire. > > The previous commits eliminated simple union from the tree. Now drop > them from the QAPI schema language entirely, and update mentions of > "flat union" to just "union". > > Signed-off-by: Markus Armbruster > --- > docs/devel/qapi-code-gen.rst | 125 ++++-------------- > scripts/qapi/expr.py | 21 +-- > scripts/qapi/schema.py | 101 +++----------- > .../qapi-schema/flat-union-array-branch.json | 2 +- > tests/qapi-schema/flat-union-empty.json | 2 +- > tests/qapi-schema/flat-union-int-branch.json | 2 +- > tests/qapi-schema/flat-union-no-base.err | 2 +- > tests/qapi-schema/flat-union-no-base.json | 2 +- > tests/qapi-schema/qapi-schema-test.json | 2 +- > tests/qapi-schema/reserved-member-u.json | 2 +- > tests/qapi-schema/union-base-empty.json | 2 +- > .../union-base-no-discriminator.err | 2 +- > .../union-base-no-discriminator.json | 2 +- > 13 files changed, 62 insertions(+), 205 deletions(-) Whee! What a fun ride! Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org