From nobody Fri Dec 19 04:14:24 2025 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=1678950847; cv=none; d=zohomail.com; s=zohoarc; b=SvRCKVvwysgpzk1xYa8FKFT1eo4Bomlaqd9HSyUO31fOnnJr2zIqM/wi65lwsdKIgxTPs5lCnMryRQCb/BaPeVLyypX3WEcRTlozLQl3ZbBYgCc+voiEf/iET5WP7xRMbL1G1OHmYBJBKlcpl7AOV1XDJvvgec8nobmKfyDbfGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678950847; 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=dCyon08GZNuo71GqM0P29omWjbczDKsa5uy94+fjclw=; b=VX2qpuPRb50M0PO4Uu2RtmXbsXZTcAi8M55LeU5ewoXCsv7d1KRn2EoXUlLxaxXBYy63g5UsmXJglby+enZjvteeqdqZr20ElvT+efE2ndy1Hloo4YRFeFVEJVPqQE3R7Yv/pLtUy+Eh4Jwt0A0Qfc3n1eN4dATWYtSXms0cac0= 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 1678950847673184.03458972529813; Thu, 16 Mar 2023 00:14:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pchoA-0003pF-8B; Thu, 16 Mar 2023 03:13:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pchns-0003j9-UD for qemu-devel@nongnu.org; Thu, 16 Mar 2023 03:13:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pchno-0004Xr-5u for qemu-devel@nongnu.org; Thu, 16 Mar 2023 03:13:36 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-240-2OF3R9vdOuilIN1xo1VRIQ-1; Thu, 16 Mar 2023 03:13:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20BF02A5955B; Thu, 16 Mar 2023 07:13:27 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.52]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F359740C6E67; Thu, 16 Mar 2023 07:13:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ED07D21E66EF; Thu, 16 Mar 2023 08:13:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678950809; 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=dCyon08GZNuo71GqM0P29omWjbczDKsa5uy94+fjclw=; b=Jv+Oy4/jupKSEbUixULfK9KJfQnJqhIn4ljzzBEptaXBnV/50mxGsZi+6lWkKO584pBFbm AiZFVfoq+DowBqTwaSwxjkKSYSscaK8n1g4hKuzRauSHhLf7y2k+SQWc4PAgD13PWTYN1P vtNHphTVRK98sw0skIGUnaC1xHz7vIM= X-MC-Unique: 2OF3R9vdOuilIN1xo1VRIQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, marcandre.lureau@redhat.com, berrange@redhat.com, eblake@redhat.com, jsnow@redhat.com Subject: [PATCH 03/14] qapi: Clean up after removal of simple unions Date: Thu, 16 Mar 2023 08:13:14 +0100 Message-Id: <20230316071325.492471-4-armbru@redhat.com> In-Reply-To: <20230316071325.492471-1-armbru@redhat.com> References: <20230316071325.492471-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678950848707100002 Content-Type: text/plain; charset="utf-8" Commit 4e99f4b12c0 (qapi: Drop simple unions) missed a bit of code dealing with simple union branches. Drop it. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi/expr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index ca01ea6f4a..59bdd86024 100644 --- a/scripts/qapi/expr.py +++ b/scripts/qapi/expr.py @@ -518,7 +518,7 @@ def check_union(expr: QAPIExpression) -> None: source =3D "'data' member '%s'" % key check_keys(value, info, source, ['type'], ['if']) check_if(value, info, source) - check_type(value['type'], info, source, allow_array=3Dnot base) + check_type(value['type'], info, source) =20 =20 def check_alternate(expr: QAPIExpression) -> None: --=20 2.39.2