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,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 A5704C433EF for ; Mon, 13 Sep 2021 14:48:49 +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 6308460555 for ; Mon, 13 Sep 2021 14:48:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6308460555 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]:46208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPnGK-0006rY-Bt for qemu-devel@archiver.kernel.org; Mon, 13 Sep 2021 10:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPnEN-0004Td-FA for qemu-devel@nongnu.org; Mon, 13 Sep 2021 10:46:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPnEM-0005oa-0O for qemu-devel@nongnu.org; Mon, 13 Sep 2021 10:46:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631544405; 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=vwfAlqPQyKQnO8EHterF+LgKoesIc5F6q7FsoyT+AAk=; b=FFMTQYSRZ50scNp0QYhBp3UQNsOn350J1R/xI7mj7yfazaxzhizo2s/nS1/3FRYhETQ8M+ ZwYRBkw7m4OCEsqnztmJBRc/Eq0EpWM3Ob6MQM6gVXA+SgB/0WAV8+aBWqG3Rh9Mykj3f3 xS/cV+PxRVdW14CEUpjd9DDymZt+EvY= 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-471-R7_aLtNIOIqV2vqNvBpt-A-1; Mon, 13 Sep 2021 10:46:44 -0400 X-MC-Unique: R7_aLtNIOIqV2vqNvBpt-A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BF36814270 for ; Mon, 13 Sep 2021 14:46:39 +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 06B895C1D1; Mon, 13 Sep 2021 14:46:38 +0000 (UTC) Date: Mon, 13 Sep 2021 09:46:37 -0500 From: Eric Blake To: Markus Armbruster Subject: Re: [PATCH 04/22] qapi: Convert simple union InputEvent to flat one Message-ID: <20210913144637.t3mw3o65cfpmgyjh@redhat.com> References: <20210913123932.3306639-1-armbru@redhat.com> <20210913123932.3306639-5-armbru@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210913123932.3306639-5-armbru@redhat.com> User-Agent: NeoMutt/20210205-772-2b4c52 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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=216.205.24.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, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Sep 13, 2021 at 02:39:14PM +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 InputEvent 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: Gerd Hoffmann > Signed-off-by: Markus Armbruster > --- > qapi/ui.json | 42 ++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 38 insertions(+), 4 deletions(-) Same question as in 3/22: > > diff --git a/qapi/ui.json b/qapi/ui.json > index a6b0dce876..fe10d69431 100644 > --- a/qapi/ui.json > +++ b/qapi/ui.json > @@ -960,6 +960,38 @@ > 'data' : { 'axis' : 'InputAxis', > 'value' : 'int' } } > > +## > +# @InputEventKind: > +# > +# Since: 6.1 This should either be 6.2, or... > ## > # @InputEvent: > # > @@ -975,10 +1007,12 @@ > # Since: 2.0 ...2.0. > ## > { 'union' : 'InputEvent', > - 'data' : { 'key' : 'InputKeyEvent', > - 'btn' : 'InputBtnEvent', > - 'rel' : 'InputMoveEvent', > - 'abs' : 'InputMoveEvent' } } > + 'base': { 'type': 'InputEventKind' }, > + 'discriminator': 'type', > + 'data' : { 'key' : 'InputKeyEventWrapper', > + 'btn' : 'InputBtnEventWrapper', > + 'rel' : 'InputMoveEventWrapper', > + 'abs' : 'InputMoveEventWrapper' } } But as with that patch, I trust your decision on docs, and the conversion itself is sane. Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org