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=-13.6 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 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 4FAA6C433EF for ; Tue, 14 Sep 2021 05:27:08 +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 AD8F1603E5 for ; Tue, 14 Sep 2021 05:27:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AD8F1603E5 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]:35926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ0yI-0004v1-Ky for qemu-devel@archiver.kernel.org; Tue, 14 Sep 2021 01:27:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ0wk-0004DR-WD for qemu-devel@nongnu.org; Tue, 14 Sep 2021 01:25:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ0wi-0007P9-0d for qemu-devel@nongnu.org; Tue, 14 Sep 2021 01:25:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631597126; 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=1EwfvmEgkDqI3kX6BemK+bgKKnm5dnZjTrV72Dlg8aQ=; b=QwQNjEIaBWoA+ly6dGmiFjeL+Yu8EFL7T2VAKozAOONMQHATNoPWV6DFvqhwFCbdzbEqU/ C8BX0itxF9VFaPFZpAHOxrSMKIe3kyyILrKecQm5nPMB2tMUp5/y5Xdmc5llW3drZRn4VM O3TyeGFWUJvqyehEULXjs+OvSyqUx5k= 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-456-bCtrbsE5MdyShEj190eJjA-1; Tue, 14 Sep 2021 01:25:24 -0400 X-MC-Unique: bCtrbsE5MdyShEj190eJjA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D34B1006AA1 for ; Tue, 14 Sep 2021 05:25:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-14.ams2.redhat.com [10.36.112.14]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A4466D983; Tue, 14 Sep 2021 05:25:19 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1B6A1113865F; Tue, 14 Sep 2021 07:25:18 +0200 (CEST) From: Markus Armbruster To: Eric Blake Subject: Re: [PATCH 10/22] qapi: Convert simple union TransactionAction to flat one References: <20210913123932.3306639-1-armbru@redhat.com> <20210913123932.3306639-11-armbru@redhat.com> <20210913145316.y73zmxsxifhdkplr@redhat.com> Date: Tue, 14 Sep 2021 07:25:18 +0200 In-Reply-To: <20210913145316.y73zmxsxifhdkplr@redhat.com> (Eric Blake's message of "Mon, 13 Sep 2021 09:53:16 -0500") Message-ID: <87wnnjg24h.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@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: Kevin Wolf , marcandre.lureau@redhat.com, Hanna Reitz , jsnow@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Eric Blake writes: > On Mon, Sep 13, 2021 at 02:39:20PM +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. >> >> To prepare for their removal, convert simple union TransactionAction >> to an equivalent flat one. Adds some boilerplate to the schema, which >> is a bit ugly, but a lot easier to maintain than the simple union >> feature. >> >> Cc: Kevin Wolf >> Cc: Hanna Reitz >> Signed-off-by: Markus Armbruster >> --- >> qapi/transaction.json | 111 +++++++++++++++++++++++++++++++++++++----- >> 1 file changed, 99 insertions(+), 12 deletions(-) > > Same comments for each of 5-10 as for 4; the conversion is sane, and > the only question is on documentation, whether you want... > >> >> diff --git a/qapi/transaction.json b/qapi/transaction.json >> index 894258d9e2..d7fc73d7df 100644 >> --- a/qapi/transaction.json >> +++ b/qapi/transaction.json >> @@ -38,6 +38,91 @@ >> { 'enum': 'ActionCompletionMode', >> 'data': [ 'individual', 'grouped' ] } >> >> +## >> +# @TransactionActionKind: >> +# >> +# Since: 6.1 > > ... 6.2 here, or to preserve the implicit... > >> ## >> # @TransactionAction: >> # >> @@ -60,19 +145,21 @@ >> # Since: 1.1 > > ...1.1 matching when the simple union was first formed (actually, this > simple union has grown over time, which makes it trickier to decide > which historical Since: to use on each Wrapper, so I'd lean towards > 6.2 on all of them as being less work). The enum becomes explicit in the schema, but is the same as before. I think copying "since" information from the no-longer-simple union and its branches to the enum and its members makes sense. The wrapper types become explicit, but with a new name. We can copy "since" from their branch anyway. Doesn't really matter, unlike for the enum. > For patches 5-10: > Reviewed-by: Eric Blake Thanks!