From nobody Mon Feb 9 20:46:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632551321; cv=none; d=zohomail.com; s=zohoarc; b=UkfLzp3XecxIEcn4Y9Vq6SxMSIdT/zf71+DMOs/rlo7eag/I0K+KoIW4iASAxVqVWF3BlanRDMSqs4Ubxp2sgkVUA7dSSBZzjmyF9d9Q1pibMHtKv7BK4eor1U9Wu6KCVoBZhZgWqgX6Xysitwn5VJ8yxqxeI0o0q/zqRFBO22s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632551321; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cgt/qx5DHAI+iBFfRYjAmQ/+wVvk1NDCMGKDj1ImZDk=; b=fAhWxbhn5iSL0p2LJJcl5ZrxZz4YqRsnoEd9ciUjfBObDiQNyIO6LZkMFjF7BgkXAbNdCj2QpTZbIzDYHNGgPQSuLEXkoHx9OJt92u3DRVDdEWO/nc9Ub8hHoX7nKZ4gF6jwhwYoeQ0tBXHtBUUJQ31g5Nl/HWVhWQFx2nYeP0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632551321797364.88417837401846; Fri, 24 Sep 2021 23:28:41 -0700 (PDT) Received: from localhost ([::1]:35292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mU1Au-0002EQ-MW for importer@patchew.org; Sat, 25 Sep 2021 02:28:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mU17z-0007YR-Si for qemu-devel@nongnu.org; Sat, 25 Sep 2021 02:25:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23046) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mU17v-0007E8-J2 for qemu-devel@nongnu.org; Sat, 25 Sep 2021 02:25:39 -0400 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-304-hfctazaONg-_qZYTnFobtg-1; Sat, 25 Sep 2021 02:25:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80B5F1084683; Sat, 25 Sep 2021 06:25:32 +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 55A3A60936; Sat, 25 Sep 2021 06:25:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3DF561138468; Sat, 25 Sep 2021 08:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632551135; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgt/qx5DHAI+iBFfRYjAmQ/+wVvk1NDCMGKDj1ImZDk=; b=S8ZgDgnnPk4vU2Q1c5+bVMQlWez0pzdSkXGLpJr7YWA5HKyl3LlV5Axpc+OV08K+uSio9w iaFezNXf+VHbJ/ER0DOASfA+WBJVGFOFCmI77mOzCDNoR0e0F/lDQe4VqojodCXRqYkG14 JWX0Acwqf0N/ec6U7AED+iVaZhnH65E= X-MC-Unique: hfctazaONg-_qZYTnFobtg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 11/25] tests/qapi-schema: Prepare for simple union UserDefListUnion removal Date: Sat, 25 Sep 2021 08:25:11 +0200 Message-Id: <20210925062525.988405-12-armbru@redhat.com> In-Reply-To: <20210925062525.988405-1-armbru@redhat.com> References: <20210925062525.988405-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) DKIMWL_WL_HIGH=-1.473, 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: peter.maydell@linaro.org, Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632551322701100002 Content-Type: text/plain; charset="utf-8" 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, simple union UserDefListUnion has to go. It is used to cover arrays. The next few commits will eliminate its uses, and then it gets deleted. As a first step, provide struct ArrayStruct for the tests to be rewritten. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20210917143134.412106-12-armbru@redhat.com> --- tests/qapi-schema/qapi-schema-test.json | 16 ++++++++++++++++ tests/qapi-schema/qapi-schema-test.out | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qa= pi-schema-test.json index 3c43e14e22..b2d795cb19 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -140,6 +140,22 @@ 'sizes': ['size'], 'any': ['any'], 'user': ['Status'] } } # intentional forward ref. to sub-module +{ 'struct': 'ArrayStruct', + 'data': { 'integer': ['int'], + 's8': ['int8'], + 's16': ['int16'], + 's32': ['int32'], + 's64': ['int64'], + 'u8': ['uint8'], + 'u16': ['uint16'], + 'u32': ['uint32'], + 'u64': ['uint64'], + 'number': ['number'], + 'boolean': ['bool'], + 'string': ['str'], + '*sz': ['size'], + '*any': ['any'], + '*user': ['Status'] } } # intentional forward ref. to sub-modu= le =20 # for testing sub-modules { 'include': 'include/sub-module.json' } diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qap= i-schema-test.out index d557fe2d89..7a488c1d06 100644 --- a/tests/qapi-schema/qapi-schema-test.out +++ b/tests/qapi-schema/qapi-schema-test.out @@ -189,6 +189,22 @@ object UserDefListUnion case sizes: q_obj_sizeList-wrapper case any: q_obj_anyList-wrapper case user: q_obj_StatusList-wrapper +object ArrayStruct + member integer: intList optional=3DFalse + member s8: int8List optional=3DFalse + member s16: int16List optional=3DFalse + member s32: int32List optional=3DFalse + member s64: int64List optional=3DFalse + member u8: uint8List optional=3DFalse + member u16: uint16List optional=3DFalse + member u32: uint32List optional=3DFalse + member u64: uint64List optional=3DFalse + member number: numberList optional=3DFalse + member boolean: boolList optional=3DFalse + member string: strList optional=3DFalse + member sz: sizeList optional=3DTrue + member any: anyList optional=3DTrue + member user: StatusList optional=3DTrue include include/sub-module.json command user-def-cmd None -> None gen=3DTrue success_response=3DTrue boxed=3DFalse oob=3DFalse preconfig= =3DFalse --=20 2.31.1