From nobody Thu Apr 25 22:02:55 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578997390; cv=none; d=zohomail.com; s=zohoarc; b=aH08fLquuqf6Rr1g2k86i6usvtEML2tFiqFzJR99JWphwhViWk7RzXf1n3q6A2mo7UCShc/igwwbPNHXTWLCvK9TqF8jS+ryyB6WGHO6tNKbEghEEvF4S4u41ZO7jBHpQC/UacthDG/pntPbCieDebvyFIp+fvCmmOqt2jBvz0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578997390; h=Content-Type:Content-Transfer-Encoding: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=CP9UPExDPMMsrTQ5ez/dcdM2GrYD9MdFqPwdDXiYSOg=; b=kxqELRIOKHDnBqDcVVnptCpQB/gsblXmc1FDr4rLwJYvuEnrIRPiRGEWVr3tepkQ7mW8CEq1A1DQNGSX9bDTm8Bh3q2NQlsRAOueX61Y6MW/yoFmQW6f3dISqMI8aztX4yUAxaCUboTeH7aEIAdupVnIexfiZaeQn27KMuUQ8jk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578997390974772.0712021873793; Tue, 14 Jan 2020 02:23:10 -0800 (PST) Received: from localhost ([::1]:36374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJLp-0003qE-Bz for importer@patchew.org; Tue, 14 Jan 2020 05:23:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40759) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJJo-0001oK-7d for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJJk-0006Rk-HR for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:04 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:34173 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJJk-0006RD-Dm for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:00 -0500 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-423-ulB_PqY-NLGmdkkOq6moRg-1; Tue, 14 Jan 2020 05:20:58 -0500 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 2E263802B7F for ; Tue, 14 Jan 2020 10:20:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F390780F52; Tue, 14 Jan 2020 10:20:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 63BB41138619; Tue, 14 Jan 2020 11:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578997260; 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=CP9UPExDPMMsrTQ5ez/dcdM2GrYD9MdFqPwdDXiYSOg=; b=CzCCdjiY1+jlxb83YQHwpY5ffb5pLRGxFUY1wYwaqFefD7hqJC2SVTMIJd8U9jutAOVQu1 CTF+YEW1T1rqT6XoZN3OIhm7dj0Kgn6o4nBwoljibaRcV4hiDUk9WGQwkIWH4ED44UzgUp taqekRC8wCQ+jiWHkLrue5rqi3faloc= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/6] qapi: Tweak "command returns a nice type" check for clarity Date: Tue, 14 Jan 2020 11:20:50 +0100 Message-Id: <20200114102055.24058-2-armbru@redhat.com> In-Reply-To: <20200114102055.24058-1-armbru@redhat.com> References: <20200114102055.24058-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ulB_PqY-NLGmdkkOq6moRg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20191120182551.23795-2-armbru@redhat.com> Reviewed-by: Eric Blake --- scripts/qapi/schema.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index cf0045f34e..cfb574c85d 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -711,10 +711,11 @@ class QAPISchemaCommand(QAPISchemaEntity): self.ret_type =3D schema.resolve_type( self._ret_type_name, self.info, "command's 'returns'") if self.name not in self.info.pragma.returns_whitelist: - if not (isinstance(self.ret_type, QAPISchemaObjectType) - or (isinstance(self.ret_type, QAPISchemaArrayType) - and isinstance(self.ret_type.element_type, - QAPISchemaObjectType))): + typ =3D self.ret_type + if isinstance(typ, QAPISchemaArrayType): + typ =3D self.ret_type.element_type + assert typ + if not isinstance(typ, QAPISchemaObjectType): raise QAPISemError( self.info, "command's 'returns' cannot take %s" --=20 2.21.1 From nobody Thu Apr 25 22:02:55 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578997509; cv=none; d=zohomail.com; s=zohoarc; b=e05GroS+LcmjVx+8cSiNYnp4KGB4ynUek25eThdEHK+CP93s81745/bVITmaq9OyXroFdQ+31qo0IrYrmG3YPep4uv+lRdEnn6FRQtu25734rD7eC+3/b9tgtPlwVamSm867Qiu3gRt3om/UsvaBtxoiGb81oid7L9AiG3qwvmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578997509; h=Content-Type:Content-Transfer-Encoding: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=JKmCsyOxh5Ji0pFoNjfE1c+OIYzbgdxgSnbldl2VS6o=; b=Oo1T8GAgYtfE8FaboYiQ8a+yzkScOuhp6i2f/iX9+9xBPgKhqSGd5clhdF/XukvnpN1xPEtsPntLSOBNNqPAj+i7P5PuVpaQwRdVUqwZuaf5tZThYSAuYiSj2siaUHSVYjuihZncwyBSI7L4SxZ99OGmhXdbBxok6ucttXGw49E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578997509155200.85904387069604; Tue, 14 Jan 2020 02:25:09 -0800 (PST) Received: from localhost ([::1]:36394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJNj-0006uN-GW for importer@patchew.org; Tue, 14 Jan 2020 05:25:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40760) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJJo-0001oP-8E for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJJk-0006RO-An for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:04 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34768 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJJk-0006Qp-6d for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:00 -0500 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-200-BwARGXDqPSK1EtKZNE-NjQ-1; Tue, 14 Jan 2020 05:20:58 -0500 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 2FAC78045F4 for ; Tue, 14 Jan 2020 10:20:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01B546FF0F; Tue, 14 Jan 2020 10:20:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 669C8113861C; Tue, 14 Jan 2020 11:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578997259; 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=JKmCsyOxh5Ji0pFoNjfE1c+OIYzbgdxgSnbldl2VS6o=; b=RDhFiI2LTqJXLXZCiUaXOt8BoUMDT0APrxCNjXgGZ8+IqK4e5hlEFpsR7btwRJ/lYjPAJf XgAXUfU0Xl1pXpPc3BsU6J6ptn9goFCCPU0touuiYiznWzRyU3ix0XqmjMK+DhQ1NcQhZ9 e03P9rH8tVS6SiwdmxV7oottEu8Javg= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/6] tests/Makefile.include: Fix missing test-qapi-emit-events.[ch] Date: Tue, 14 Jan 2020 11:20:51 +0100 Message-Id: <20200114102055.24058-3-armbru@redhat.com> In-Reply-To: <20200114102055.24058-1-armbru@redhat.com> References: <20200114102055.24058-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: BwARGXDqPSK1EtKZNE-NjQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit 5d75648b56 "qapi: Generate QAPIEvent stuff into separate files" added tests/test-qapi-emit-events.[ch] to the set of generated files, but neglected to update tests/.gitignore and tests/Makefile.include. Commit a0af8cee3c "tests/.gitignore: ignore test-qapi-emit-events.[ch] for in-tree builds" fixed the former. Now fix the latter. Signed-off-by: Markus Armbruster Message-Id: <20191120182551.23795-3-armbru@redhat.com> Reviewed-by: Eric Blake --- tests/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 7a767bf114..cd5e13f42f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -506,6 +506,7 @@ generated-files-y +=3D tests/test-qapi-visit-sub-sub-mo= dule.h generated-files-y +=3D tests/test-qapi-commands.h generated-files-y +=3D tests/include/test-qapi-commands-sub-module.h generated-files-y +=3D tests/test-qapi-commands-sub-sub-module.h +generated-files-y +=3D tests/test-qapi-emit-events.h generated-files-y +=3D tests/test-qapi-events.h generated-files-y +=3D tests/include/test-qapi-events-sub-module.h generated-files-y +=3D tests/test-qapi-events-sub-sub-module.h @@ -614,6 +615,7 @@ tests/include/test-qapi-commands-sub-module.h \ tests/include/test-qapi-commands-sub-module.c \ tests/test-qapi-commands-sub-sub-module.h \ tests/test-qapi-commands-sub-sub-module.c \ +tests/test-qapi-emit-events.c tests/test-qapi-emit-events.h \ tests/test-qapi-events.c tests/test-qapi-events.h \ tests/include/test-qapi-events-sub-module.c \ tests/include/test-qapi-events-sub-module.h \ @@ -654,7 +656,7 @@ tests/dbus-vmstate-test.o: tests/dbus-vmstate1.h =20 tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) -tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-events.o +tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-emit-events.o tests/test-qapi-events.o tests/test-qobject-output-visitor$(EXESUF): tests/test-qobject-output-visi= tor.o $(test-qapi-obj-y) tests/test-clone-visitor$(EXESUF): tests/test-clone-visitor.o $(test-qapi-= obj-y) tests/test-qobject-input-visitor$(EXESUF): tests/test-qobject-input-visito= r.o $(test-qapi-obj-y) --=20 2.21.1 From nobody Thu Apr 25 22:02:55 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578997615; cv=none; d=zohomail.com; s=zohoarc; b=aVHsFzyyjLCllWIMB823llXbAzwziEpXVJXmKQDXbiVQUXxZGDHXVLt+8Q7Y2ctKja6P8v6qx3ZVdJ+kTt5LuyddgM/Fon9yEvyHnNYSWtwGOoS/Dwq6vxjvsmSk9JZi8e9NOfUkhtLByEjhM+/53BEE3hgBgW8saFRsDUi+eUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578997615; h=Content-Type:Content-Transfer-Encoding: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=7iotsYsQYNynPfiOcg9UUkzudsIsJyF9Azh+jxKs6Uk=; b=YfMPG/BszNDvbec6mfca81BdKmYpUQtJC/Gobyes9cxP9IgEJqQA+5dxm76HFdWsiumuQR8E7LIyfoMCT2czhdKNtu7XJ7OYmsPA5+iLHibgEfNLY9IiNy4uD8YtMeaQEd/ygCxLopkWaO7qmxBL39nrg5F20+tHbMSiFG+ebLY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578997615526309.0080289189051; Tue, 14 Jan 2020 02:26:55 -0800 (PST) Received: from localhost ([::1]:36420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJPS-0000t2-96 for importer@patchew.org; Tue, 14 Jan 2020 05:26:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40755) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJJn-0001nr-Vd for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJJk-0006RH-6g for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:03 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43131 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJJk-0006Qu-1m for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:00 -0500 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-189-TppVqWjPNKC3ffeR5tLB-g-1; Tue, 14 Jan 2020 05:20:58 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56CA51012ECC for ; Tue, 14 Jan 2020 10:20:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0172260BF4; Tue, 14 Jan 2020 10:20:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6A65011384A8; Tue, 14 Jan 2020 11:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578997259; 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=7iotsYsQYNynPfiOcg9UUkzudsIsJyF9Azh+jxKs6Uk=; b=LljV/iSVuLZ8dm1fN0akm4Ra1T7LoTXhfrgg0wvIKRkvlo3287i9PXvZrLJmEMfIpPwvyJ ZzGK9StyIx4IvEyK/o1xWjan3EUWDzabC5hzU1J12DUApYWHIEwllfV6kBfTFSewLArinP lOnuuid3+T8ZLjOLykk9i89ieBVZS4g= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/6] qapi: Generate command registration stuff into separate files Date: Tue, 14 Jan 2020 11:20:52 +0100 Message-Id: <20200114102055.24058-4-armbru@redhat.com> In-Reply-To: <20200114102055.24058-1-armbru@redhat.com> References: <20200114102055.24058-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: TppVqWjPNKC3ffeR5tLB-g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Having to include qapi-commands.h just for qmp_init_marshal() is suboptimal. Generate it into separate files. This lets monitor/misc.c, qga/main.c, and the generated qapi-commands-FOO.h include less. Signed-off-by: Markus Armbruster Message-Id: <20191120182551.23795-4-armbru@redhat.com> [Typos in docs/devel/qapi-code-gen.txt fixed] Reviewed-by: Eric Blake --- docs/devel/qapi-code-gen.txt | 19 ++++++++++++++++--- Makefile | 4 +++- monitor/misc.c | 7 ++++++- qga/main.c | 2 +- tests/test-qmp-cmds.c | 1 + .gitignore | 1 + qapi/Makefile.objs | 1 + qga/Makefile.objs | 1 + scripts/qapi/commands.py | 15 +++++++++++---- tests/.gitignore | 1 + tests/Makefile.include | 5 ++++- 11 files changed, 46 insertions(+), 11 deletions(-) diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index 45c93a43cc..59d6973e1e 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -1493,6 +1493,10 @@ $(prefix)qapi-commands.c: Command marshal/dispatch f= unctions for each $(prefix)qapi-commands.h: Function prototypes for the QMP commands specified in the schema =20 +$(prefix)qapi-init-commands.h - Command initialization prototype + +$(prefix)qapi-init-commands.c - Command initialization code + Example: =20 $ cat qapi-generated/example-qapi-commands.h @@ -1502,11 +1506,9 @@ Example: #define EXAMPLE_QAPI_COMMANDS_H =20 #include "example-qapi-types.h" - #include "qapi/qmp/dispatch.h" =20 UserDefOne *qmp_my_command(UserDefOneList *arg1, Error **errp); void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp); - void example_qmp_init_marshal(QmpCommandList *cmds); =20 #endif /* EXAMPLE_QAPI_COMMANDS_H */ $ cat qapi-generated/example-qapi-commands.c @@ -1566,7 +1568,19 @@ Example: visit_end_struct(v, NULL); visit_free(v); } +[Uninteresting stuff omitted...] + $ cat qapi-generated/example-qapi-init-commands.h +[Uninteresting stuff omitted...] + #ifndef EXAMPLE_QAPI_INIT_COMMANDS_H + #define EXAMPLE_QAPI_INIT_COMMANDS_H =20 + #include "qapi/qmp/dispatch.h" + + void example_qmp_init_marshal(QmpCommandList *cmds); + + #endif /* EXAMPLE_QAPI_INIT_COMMANDS_H */ + $ cat qapi-generated/example-qapi-init-commands.c +[Uninteresting stuff omitted...] void example_qmp_init_marshal(QmpCommandList *cmds) { QTAILQ_INIT(cmds); @@ -1574,7 +1588,6 @@ Example: qmp_register_command(cmds, "my-command", qmp_marshal_my_command, QCO_NO_OPTIONS); } - [Uninteresting stuff omitted...] =20 For a modular QAPI schema (see section Include directives), code for diff --git a/Makefile b/Makefile index 6b5ad1121b..56ff731a53 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,7 @@ GENERATED_QAPI_FILES +=3D qapi/qapi-builtin-visit.h qap= i/qapi-builtin-visit.c GENERATED_QAPI_FILES +=3D qapi/qapi-visit.h qapi/qapi-visit.c GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-visit-%.h) GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-visit-%.c) +GENERATED_QAPI_FILES +=3D qapi/qapi-init-commands.h qapi/qapi-init-command= s.c GENERATED_QAPI_FILES +=3D qapi/qapi-commands.h qapi/qapi-commands.c GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-commands-%.h) GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qapi-commands-%.c) @@ -601,6 +602,7 @@ $(SRC_PATH)/scripts/qapi-gen.py qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \ qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h \ qga/qapi-generated/qga-qapi-commands.h qga/qapi-generated/qga-qapi-command= s.c \ +qga/qapi-generated/qga-qapi-init-commands.h qga/qapi-generated/qga-qapi-in= it-commands.c \ qga/qapi-generated/qga-qapi-doc.texi: \ qga/qapi-generated/qapi-gen-timestamp ; qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(= qapi-py) @@ -619,7 +621,7 @@ qapi-gen-timestamp: $(qapi-modules) $(qapi-py) "GEN","$(@:%-timestamp=3D%)") @>$@ =20 -QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-vi= sit.h qga-qapi-commands.h) +QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-vi= sit.h qga-qapi-commands.h qga-qapi-init-commands.h) $(qga-obj-y): $(QGALIB_GEN) =20 qemu-ga$(EXESUF): $(qga-obj-y) $(COMMON_LDADDS) diff --git a/monitor/misc.c b/monitor/misc.c index a04d7edde0..de1ca4d114 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -66,8 +66,13 @@ #include "qemu/option.h" #include "qemu/thread.h" #include "block/qapi.h" -#include "qapi/qapi-commands.h" +#include "qapi/qapi-commands-char.h" +#include "qapi/qapi-commands-migration.h" +#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-qom.h" +#include "qapi/qapi-commands-trace.h" #include "qapi/qapi-emit-events.h" +#include "qapi/qapi-init-commands.h" #include "qapi/error.h" #include "qapi/qmp-event.h" #include "qapi/qapi-introspect.h" diff --git a/qga/main.c b/qga/main.c index c35c2a2120..e5c39c189a 100644 --- a/qga/main.c +++ b/qga/main.c @@ -24,7 +24,7 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" #include "guest-agent-core.h" -#include "qga-qapi-commands.h" +#include "qga-qapi-init-commands.h" #include "qapi/qmp/qerror.h" #include "qapi/error.h" #include "channel.h" diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c index 27b0afe55a..79507d9e54 100644 --- a/tests/test-qmp-cmds.c +++ b/tests/test-qmp-cmds.c @@ -7,6 +7,7 @@ #include "tests/test-qapi-types.h" #include "tests/test-qapi-visit.h" #include "test-qapi-commands.h" +#include "test-qapi-init-commands.h" =20 static QmpCommandList qmp_commands; =20 diff --git a/.gitignore b/.gitignore index 7de868d1ea..efad605e1a 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ /qapi/qapi-emit-events.[ch] /qapi/qapi-events-*.[ch] /qapi/qapi-events.[ch] +/qapi/qapi-init-commands.[ch] /qapi/qapi-introspect.[ch] /qapi/qapi-types-*.[ch] /qapi/qapi-types.[ch] diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index dd3f5e6f94..a8f1f4c35e 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -30,3 +30,4 @@ obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-events-%.o) obj-y +=3D qapi-events.o obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-commands-%.o) obj-y +=3D qapi-commands.o +obj-y +=3D qapi-init-commands.o diff --git a/qga/Makefile.objs b/qga/Makefile.objs index 80e6bb3c2e..9c558ae51c 100644 --- a/qga/Makefile.objs +++ b/qga/Makefile.objs @@ -5,5 +5,6 @@ qga-obj-$(CONFIG_WIN32) +=3D commands-win32.o channel-win32= .o service-win32.o qga-obj-$(CONFIG_WIN32) +=3D vss-win32.o qga-obj-y +=3D qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-vis= it.o qga-obj-y +=3D qapi-generated/qga-qapi-commands.o +qga-obj-y +=3D qapi-generated/qga-qapi-init-commands.o =20 qga-vss-dll-obj-$(CONFIG_QGA_VSS) +=3D vss-win32/ diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index ab98e504f3..47f4a18cfe 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -263,18 +263,25 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCV= isitor): commands=3Dcommands, visit=3Dvisit)) self._genh.add(mcgen(''' #include "%(types)s.h" -#include "qapi/qmp/dispatch.h" =20 ''', types=3Dtypes)) =20 def visit_end(self): - (genc, genh) =3D self._module[self._main_module] - genh.add(mcgen(''' + self._add_system_module('init', ' * QAPI Commands initialization') + self._genh.add(mcgen(''' +#include "qapi/qmp/dispatch.h" + void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''', c_prefix=3Dc_name(self._prefix, protect=3DFalse))) - genc.add(gen_registry(self._regy.get_content(), self._prefix)) + self._genc.preamble_add(mcgen(''' +#include "qemu/osdep.h" +#include "%(prefix)sqapi-commands.h" +#include "%(prefix)sqapi-init-commands.h" +''', + prefix=3Dself._prefix)) + self._genc.add(gen_registry(self._regy.get_content(), self._prefix= )) =20 def visit_command(self, name, info, ifcond, arg_type, ret_type, gen, success_response, boxed, allow_oob, allow_preconfig, diff --git a/tests/.gitignore b/tests/.gitignore index f9c0170881..7306866f21 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -12,6 +12,7 @@ test-* !test-*.c !docker/test-* test-qapi-commands.[ch] +test-qapi-init-commands.[ch] include/test-qapi-commands-sub-module.[ch] test-qapi-commands-sub-sub-module.[ch] test-qapi-emit-events.[ch] diff --git a/tests/Makefile.include b/tests/Makefile.include index cd5e13f42f..c666448e03 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -504,6 +504,7 @@ generated-files-y +=3D tests/test-qapi-visit.h generated-files-y +=3D tests/include/test-qapi-visit-sub-module.h generated-files-y +=3D tests/test-qapi-visit-sub-sub-module.h generated-files-y +=3D tests/test-qapi-commands.h +generated-files-y +=3D tests/test-qapi-init-commands.h generated-files-y +=3D tests/include/test-qapi-commands-sub-module.h generated-files-y +=3D tests/test-qapi-commands-sub-sub-module.h generated-files-y +=3D tests/test-qapi-emit-events.h @@ -617,6 +618,8 @@ tests/test-qapi-commands-sub-sub-module.h \ tests/test-qapi-commands-sub-sub-module.c \ tests/test-qapi-emit-events.c tests/test-qapi-emit-events.h \ tests/test-qapi-events.c tests/test-qapi-events.h \ +tests/test-qapi-init-commands.c \ +tests/test-qapi-init-commands.h \ tests/include/test-qapi-events-sub-module.c \ tests/include/test-qapi-events-sub-module.h \ tests/test-qapi-events-sub-sub-module.c \ @@ -660,7 +663,7 @@ tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $= (test-qapi-obj-y) tests/t tests/test-qobject-output-visitor$(EXESUF): tests/test-qobject-output-visi= tor.o $(test-qapi-obj-y) tests/test-clone-visitor$(EXESUF): tests/test-clone-visitor.o $(test-qapi-= obj-y) tests/test-qobject-input-visitor$(EXESUF): tests/test-qobject-input-visito= r.o $(test-qapi-obj-y) -tests/test-qmp-cmds$(EXESUF): tests/test-qmp-cmds.o tests/test-qapi-comman= ds.o $(test-qapi-obj-y) +tests/test-qmp-cmds$(EXESUF): tests/test-qmp-cmds.o tests/test-qapi-comman= ds.o tests/test-qapi-init-commands.o $(test-qapi-obj-y) tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serializatio= n.o $(test-qapi-obj-y) tests/test-opts-visitor$(EXESUF): tests/test-opts-visitor.o $(test-qapi-ob= j-y) =20 --=20 2.21.1 From nobody Thu Apr 25 22:02:55 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578997646; cv=none; d=zohomail.com; s=zohoarc; b=U4i46histbzbD3wJtCLRPWhkPl/atp3umwcwv/8ro2SLE3Xq3WCV3YwhCRsD1gL3bl6+1MbnM1misk1sZZxpZyXOl9z4wYMc98BPPtJx+r+7pbPkVUoCc58P+4CzDmK0OMEjRfvQtQDZr+fmSNRB509OQZ2rV+YAxQpGhE0gR/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578997646; h=Content-Type:Content-Transfer-Encoding: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=dZPO5CKIjizq2YPGlIJxcJNQerUddJt7LdYSkITV7go=; b=AaAbXITEycy5P0ZtFUuSlIuX3e9QYMxs7LH0CoEKDaUaP5zDj29wXOdVlZnbOUVlGMH/0h8jWIRgxintAiodg265bRzkM2dPw/jsFjrrFmuSiK0yhIEaBQ7i1AeaxxlOjoeKOzghP84RE3zofhvBoxENdX0QN+9nPg/1j1bz/Ag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578997646218327.60345701117683; Tue, 14 Jan 2020 02:27:26 -0800 (PST) Received: from localhost ([::1]:36434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJPx-00021o-2u for importer@patchew.org; Tue, 14 Jan 2020 05:27:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40793) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJJq-0001sL-Oh for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJJn-0006UC-11 for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:06 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:41955 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJJm-0006TK-TT for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:02 -0500 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-104-E2J_0EAlNMqo2B3aDW56gw-1; Tue, 14 Jan 2020 05:20:58 -0500 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 BDB89106BC0A for ; Tue, 14 Jan 2020 10:20:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 017035C1B0; Tue, 14 Jan 2020 10:20:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6E77611366C1; Tue, 14 Jan 2020 11:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578997262; 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=dZPO5CKIjizq2YPGlIJxcJNQerUddJt7LdYSkITV7go=; b=Fr0Byo036m7VV01XoqcFkb7AuY8uGR4XWFKV2CYqeBSarS3AgQa0688FeHsirvDv8Rqv+I K1Rk3dYcwdvDO8NUBhS4cuLeZx3ViLdAxEtpnMXBKVkRn6psLo3UK+ZxVRyZbPSiP36y/K 9AfGhlMIbZnLjkaoDz64hLFjR6tCvIU= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 4/6] qapi: Proper intermediate representation for modules Date: Tue, 14 Jan 2020 11:20:53 +0100 Message-Id: <20200114102055.24058-5-armbru@redhat.com> In-Reply-To: <20200114102055.24058-1-armbru@redhat.com> References: <20200114102055.24058-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: E2J_0EAlNMqo2B3aDW56gw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Modules are represented only by their names so far. Introduce class QAPISchemaModule. So far, it merely wraps the name. The next patch will put it to more interesting use. Once again, arrays spice up the patch a bit. For any other type, @info points to the definition, which lets us map from @info to module. For arrays, there is no definition, and @info points to the first use instead. We have to use the element type's module instead, which is only available after .check(). Signed-off-by: Markus Armbruster Message-Id: <20191120182551.23795-5-armbru@redhat.com> Reviewed-by: Eric Blake --- scripts/qapi/schema.py | 63 ++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index cfb574c85d..0f2e0dcfce 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -50,9 +50,6 @@ class QAPISchemaEntity(object): =20 def check(self, schema): assert not self._checked - if self.info: - self._module =3D os.path.relpath(self.info.fname, - os.path.dirname(schema.fname)) seen =3D {} for f in self.features: f.check_clash(self.info, seen) @@ -68,6 +65,13 @@ class QAPISchemaEntity(object): if self.doc: self.doc.check() =20 + def _set_module(self, schema, info): + assert self._checked + self._module =3D schema.module_by_fname(info and info.fname) + + def set_module(self, schema): + self._set_module(schema, self.info) + @property def ifcond(self): assert self._checked @@ -75,7 +79,7 @@ class QAPISchemaEntity(object): =20 @property def module(self): - assert self._checked + assert self._module or not self.info return self._module =20 def is_implicit(self): @@ -135,15 +139,19 @@ class QAPISchemaVisitor(object): pass =20 =20 +class QAPISchemaModule(object): + def __init__(self, name): + self.name =3D name + + class QAPISchemaInclude(QAPISchemaEntity): - - def __init__(self, fname, info): + def __init__(self, sub_module, info): QAPISchemaEntity.__init__(self, None, info, None) - self.fname =3D fname + self._sub_module =3D sub_module =20 def visit(self, visitor): QAPISchemaEntity.visit(self, visitor) - visitor.visit_include(self.fname, self.info) + visitor.visit_include(self._sub_module.name, self.info) =20 =20 class QAPISchemaType(QAPISchemaEntity): @@ -276,16 +284,14 @@ class QAPISchemaArrayType(QAPISchemaType): self.info and self.info.defn_meta) assert not isinstance(self.element_type, QAPISchemaArrayType) =20 + def set_module(self, schema): + self._set_module(schema, self.element_type.info) + @property def ifcond(self): assert self._checked return self.element_type.ifcond =20 - @property - def module(self): - assert self._checked - return self.element_type.module - def is_implicit(self): return True =20 @@ -783,6 +789,10 @@ class QAPISchema(object): self.docs =3D parser.docs self._entity_list =3D [] self._entity_dict =3D {} + self._module_dict =3D {} + self._schema_dir =3D os.path.dirname(fname) + self._make_module(None) # built-ins + self._make_module(fname) self._predefining =3D True self._def_predefineds() self._predefining =3D False @@ -826,14 +836,26 @@ class QAPISchema(object): info, "%s uses unknown type '%s'" % (what, name)) return typ =20 + def _module_name(self, fname): + if fname is None: + return None + return os.path.relpath(fname, self._schema_dir) + + def _make_module(self, fname): + name =3D self._module_name(fname) + if not name in self._module_dict: + self._module_dict[name] =3D QAPISchemaModule(name) + return self._module_dict[name] + + def module_by_fname(self, fname): + name =3D self._module_name(fname) + assert name in self._module_dict + return self._module_dict[name] + def _def_include(self, expr, info, doc): include =3D expr['include'] assert doc is None - main_info =3D info - while main_info.parent: - main_info =3D main_info.parent - fname =3D os.path.relpath(include, os.path.dirname(main_info.fname= )) - self._def_entity(QAPISchemaInclude(fname, info)) + self._def_entity(QAPISchemaInclude(self._make_module(include), inf= o)) =20 def _def_builtin_type(self, name, json_type, c_type): self._def_entity(QAPISchemaBuiltinType(name, json_type, c_type)) @@ -1065,15 +1087,16 @@ class QAPISchema(object): ent.check(self) ent.connect_doc() ent.check_doc() + for ent in self._entity_list: + ent.set_module(self) =20 def visit(self, visitor): visitor.visit_begin(self) module =3D None - visitor.visit_module(module) for entity in self._entity_list: if visitor.visit_needed(entity): if entity.module !=3D module: module =3D entity.module - visitor.visit_module(module) + visitor.visit_module(module.name) entity.visit(visitor) visitor.visit_end() --=20 2.21.1 From nobody Thu Apr 25 22:02:55 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578997532; cv=none; d=zohomail.com; s=zohoarc; b=h40YovGiFxZRnRR3yNSqvbTKDMgc5peTwiUeDxafsEx+HHDOghIyj4IUV1JA4h+mzLi10ABuxjgCN+IpqvQjUkqs5Dw6WUv1GF8OuU6uiw980vLmRWmaw00sbL0FP8xkQ8kb0HKvTbeD231ppvY8NF20TfLxc5yBYw3OMye7+I4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578997532; h=Content-Type:Content-Transfer-Encoding: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=u4cGs+iq5K+32q0R4n8g4l7sNjgTjSBhSD/sRlHEoBM=; b=LbRVwIAyzuIoWEPQkXTDUerwi0MYrCZ42BVm6RCtscCn9bnaC8PcOxu9Ia98ndcRlQFYpqt0UWuI4581gchHr1SRao2Oe3HGUmlhJTlfkwfm+SCBkqoSylFsUtXtXoWED8mK8k19kmRE3VXHIqiTWaKHm9sKzNSF0Kj9BydciZ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578997532732169.8565877279393; Tue, 14 Jan 2020 02:25:32 -0800 (PST) Received: from localhost ([::1]:36400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJO6-0007Tc-T6 for importer@patchew.org; Tue, 14 Jan 2020 05:25:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40804) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJJs-0001ve-QC for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJJo-0006VX-Sa for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:08 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21003 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJJo-0006VJ-Ow for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:04 -0500 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-7-qEHURjOCM866ft0Rgghrcg-1; Tue, 14 Jan 2020 05:20:59 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C88778045F3 for ; Tue, 14 Jan 2020 10:20:58 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6FABD19C5B; Tue, 14 Jan 2020 10:20:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 72FAD11366C2; Tue, 14 Jan 2020 11:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578997264; 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=u4cGs+iq5K+32q0R4n8g4l7sNjgTjSBhSD/sRlHEoBM=; b=KadpEd2csbQXDnRl9UIPAnGEo29uyWwrQm6SWPmMSOvehHqwlPSCC4VIycP8upUBWdg5YB wf+eVs7id+5JZ4X7vI69Tk0TjzdIfc5PYSymLWhz9GlME07wYuF2hCg7cCAP+3jt9b7kCK ra+Z2gzNko/khky01Z6d+HACPJOTAn0= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 5/6] qapi: Fix code generation for empty modules Date: Tue, 14 Jan 2020 11:20:54 +0100 Message-Id: <20200114102055.24058-6-armbru@redhat.com> In-Reply-To: <20200114102055.24058-1-armbru@redhat.com> References: <20200114102055.24058-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: qEHURjOCM866ft0Rgghrcg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When a sub-module doesn't contain any definitions, we don't generate code for it, but we do generate the #include. We generate code only for modules that get visited. QAPISchema.visit() visits only modules that have definitions. It can visit modules multiple times. Clean this up as follows. Collect entities in their QAPISchemaModule. Have QAPISchema.visit() call QAPISchemaModule.visit() for each module. Have QAPISchemaModule.visit() call .visit_module() for itself, and QAPISchemaEntity.visit() for each of its entities. This way, we visit each module exactly once. Signed-off-by: Markus Armbruster Message-Id: <20191120182551.23795-6-armbru@redhat.com> Reviewed-by: Eric Blake --- scripts/qapi/schema.py | 24 +++++++++++++----------- tests/qapi-schema/empty.out | 1 + tests/qapi-schema/include-repetition.out | 6 ++---- tests/qapi-schema/qapi-schema-test.out | 24 ++++++++++-------------- 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 0f2e0dcfce..0bfc5256fb 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -68,6 +68,7 @@ class QAPISchemaEntity(object): def _set_module(self, schema, info): assert self._checked self._module =3D schema.module_by_fname(info and info.fname) + self._module.add_entity(self) =20 def set_module(self, schema): self._set_module(schema, self.info) @@ -77,11 +78,6 @@ class QAPISchemaEntity(object): assert self._checked return self._ifcond =20 - @property - def module(self): - assert self._module or not self.info - return self._module - def is_implicit(self): return not self.info =20 @@ -142,6 +138,16 @@ class QAPISchemaVisitor(object): class QAPISchemaModule(object): def __init__(self, name): self.name =3D name + self._entity_list =3D [] + + def add_entity(self, ent): + self._entity_list.append(ent) + + def visit(self, visitor): + visitor.visit_module(self.name) + for entity in self._entity_list: + if visitor.visit_needed(entity): + entity.visit(visitor) =20 =20 class QAPISchemaInclude(QAPISchemaEntity): @@ -1093,10 +1099,6 @@ class QAPISchema(object): def visit(self, visitor): visitor.visit_begin(self) module =3D None - for entity in self._entity_list: - if visitor.visit_needed(entity): - if entity.module !=3D module: - module =3D entity.module - visitor.visit_module(module.name) - entity.visit(visitor) + for mod in self._module_dict.values(): + mod.visit(visitor) visitor.visit_end() diff --git a/tests/qapi-schema/empty.out b/tests/qapi-schema/empty.out index 5b53d00702..69666c39ad 100644 --- a/tests/qapi-schema/empty.out +++ b/tests/qapi-schema/empty.out @@ -9,3 +9,4 @@ enum QType member qdict member qlist member qbool +module empty.json diff --git a/tests/qapi-schema/include-repetition.out b/tests/qapi-schema/i= nclude-repetition.out index 5423983239..0b654ddebb 100644 --- a/tests/qapi-schema/include-repetition.out +++ b/tests/qapi-schema/include-repetition.out @@ -11,15 +11,13 @@ enum QType member qbool module include-repetition.json include comments.json +include include-repetition-sub.json +include comments.json module comments.json enum Status member good member bad member ugly -module include-repetition.json -include include-repetition-sub.json module include-repetition-sub.json include comments.json include comments.json -module include-repetition.json -include comments.json diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qap= i-schema-test.out index 3660e75a48..9bd3c4a490 100644 --- a/tests/qapi-schema/qapi-schema-test.out +++ b/tests/qapi-schema/qapi-schema-test.out @@ -153,9 +153,6 @@ object q_obj_sizeList-wrapper member data: sizeList optional=3DFalse object q_obj_anyList-wrapper member data: anyList optional=3DFalse -module sub-sub-module.json -array StatusList Status -module qapi-schema-test.json object q_obj_StatusList-wrapper member data: StatusList optional=3DFalse enum UserDefListUnionKind @@ -193,17 +190,6 @@ object UserDefListUnion case any: q_obj_anyList-wrapper case user: q_obj_StatusList-wrapper include include/sub-module.json -module include/sub-module.json -include sub-sub-module.json -module sub-sub-module.json -enum Status - member good - member bad - member ugly -module include/sub-module.json -object SecondArrayRef - member s: StatusList optional=3DFalse -module qapi-schema-test.json command user_def_cmd None -> None gen=3DTrue success_response=3DTrue boxed=3DFalse oob=3DFalse preconfig= =3DFalse object q_obj_user_def_cmd1-arg @@ -435,3 +421,13 @@ command test-command-cond-features3 None -> None gen=3DTrue success_response=3DTrue boxed=3DFalse oob=3DFalse preconfig= =3DFalse feature feature1 if ['defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)'] +module include/sub-module.json +include sub-sub-module.json +object SecondArrayRef + member s: StatusList optional=3DFalse +module sub-sub-module.json +array StatusList Status +enum Status + member good + member bad + member ugly --=20 2.21.1 From nobody Thu Apr 25 22:02:55 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578997453; cv=none; d=zohomail.com; s=zohoarc; b=nlB/NOl75YCCBy3wCrShsKfd/yVd5oxcr+YlfCsY+WsEnXj+VwwhsUxgRkm5a5xV9tK8OsbaSGLBTnr/KOnHiEZIM7ff0fE3NsnFvoN/3cwldTdj4rQaFoT0AYfrPCyP/i5n+6NQN7KxqbeOcQuL6wQwjXWTAEZYFAzohHLrti8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578997453; h=Content-Type:Content-Transfer-Encoding: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=wBmMdrUGwo7xMZquGS31t/mV3p1axZxNpkcDKZvwZMI=; b=C7DhVCcRBoHxndLMti6y8wB7P2XFedlPcOjzWBaH8bseep3+1rWRCl1dFxZXJfARuoMPc+KHHVdkHBuxTEmqAtmt+/qDPaohDa58J3vCWp3ZtfOJczipegJlKf7cmv1Ed2HAZppjl09FgR366faPyWnI9hBQ6li3AKUW/YJSJBQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578997453853141.93247944877487; Tue, 14 Jan 2020 02:24:13 -0800 (PST) Received: from localhost ([::1]:36382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJMq-0005X2-8Z for importer@patchew.org; Tue, 14 Jan 2020 05:24:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40771) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJJo-0001pN-Tg for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJJl-0006SC-7s for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:04 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36913 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJJl-0006Ro-3X for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:01 -0500 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-34-mB42buHNOlm6GIpDAv0Tog-1; Tue, 14 Jan 2020 05:20:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C145C802B82 for ; Tue, 14 Jan 2020 10:20:58 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A9FB60BF1; Tue, 14 Jan 2020 10:20:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 76DCB11366C4; Tue, 14 Jan 2020 11:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578997260; 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=wBmMdrUGwo7xMZquGS31t/mV3p1axZxNpkcDKZvwZMI=; b=R7JrEwSFTUEbiAv0U5cjd+ZyPy3rsezoretvgweLDJNoPKY6txPmHAHO+FQwYVmYBXOSEG T2DpiGxzGcsMGhrvk68bNrFbVJ5FPwQvhYOr9iifvy9MSt6mT+HMoTlvs4+EfJ9OYcL0sL VxnJTC93nsaLCrVz3ZTzkkZPve3LaNU= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 6/6] qapi: Simplify QAPISchemaModularCVisitor Date: Tue, 14 Jan 2020 11:20:55 +0100 Message-Id: <20200114102055.24058-7-armbru@redhat.com> In-Reply-To: <20200114102055.24058-1-armbru@redhat.com> References: <20200114102055.24058-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: mB42buHNOlm6GIpDAv0Tog-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Since the previous commit, QAPISchemaVisitor.visit_module() is called just once. Simplify QAPISchemaModularCVisitor accordingly. Signed-off-by: Markus Armbruster Message-Id: <20191120182551.23795-7-armbru@redhat.com> Reviewed-by: Eric Blake --- scripts/qapi/commands.py | 2 +- scripts/qapi/events.py | 2 +- scripts/qapi/gen.py | 28 ++++++++++++++-------------- scripts/qapi/types.py | 5 +++-- scripts/qapi/visit.py | 8 ++++---- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index 47f4a18cfe..afa55b055c 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -239,7 +239,7 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVis= itor): def __init__(self, prefix): QAPISchemaModularCVisitor.__init__( self, prefix, 'qapi-commands', - ' * Schema-defined QAPI/QMP commands', __doc__) + ' * Schema-defined QAPI/QMP commands', None, __doc__) self._regy =3D QAPIGenCCode(None) self._visited_ret_types =3D {} =20 diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py index 10fc509fa9..2bde3e6128 100644 --- a/scripts/qapi/events.py +++ b/scripts/qapi/events.py @@ -140,7 +140,7 @@ class QAPISchemaGenEventVisitor(QAPISchemaModularCVisit= or): def __init__(self, prefix): QAPISchemaModularCVisitor.__init__( self, prefix, 'qapi-events', - ' * Schema-defined QAPI/QMP events', __doc__) + ' * Schema-defined QAPI/QMP events', None, __doc__) self._event_enum_name =3D c_name(prefix + 'QAPIEvent', protect=3DF= alse) self._event_enum_members =3D [] self._event_emit_name =3D c_name(prefix + 'qapi_event_emit') diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index 112b6d94c5..95afae0615 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -201,10 +201,11 @@ class QAPISchemaMonolithicCVisitor(QAPISchemaVisitor): =20 class QAPISchemaModularCVisitor(QAPISchemaVisitor): =20 - def __init__(self, prefix, what, blurb, pydoc): + def __init__(self, prefix, what, user_blurb, builtin_blurb, pydoc): self._prefix =3D prefix self._what =3D what - self._blurb =3D blurb + self._user_blurb =3D user_blurb + self._builtin_blurb =3D builtin_blurb self._pydoc =3D pydoc self._genc =3D None self._genh =3D None @@ -245,7 +246,7 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): genc =3D QAPIGenC(basename + '.c', blurb, self._pydoc) genh =3D QAPIGenH(basename + '.h', blurb, self._pydoc) self._module[name] =3D (genc, genh) - self._set_module(name) + self._genc, self._genh =3D self._module[name] =20 def _add_user_module(self, name, blurb): assert self._is_user_module(name) @@ -256,9 +257,6 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): def _add_system_module(self, name, blurb): self._add_module(name and './' + name, blurb) =20 - def _set_module(self, name): - self._genc, self._genh =3D self._module[name] - def write(self, output_dir, opt_builtins=3DFalse): for name in self._module: if self._is_builtin_module(name) and not opt_builtins: @@ -271,15 +269,17 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): pass =20 def visit_module(self, name): - if name in self._module: - self._set_module(name) - elif self._is_builtin_module(name): - # The built-in module has not been created. No code may - # be generated. - self._genc =3D None - self._genh =3D None + if name is None: + if self._builtin_blurb: + self._add_system_module(None, self._builtin_blurb) + self._begin_system_module(name) + else: + # The built-in module has not been created. No code may + # be generated. + self._genc =3D None + self._genh =3D None else: - self._add_user_module(name, self._blurb) + self._add_user_module(name, self._user_blurb) self._begin_user_module(name) =20 def visit_include(self, name, info): diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index d8751daa04..99dcaf7074 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -243,8 +243,9 @@ class QAPISchemaGenTypeVisitor(QAPISchemaModularCVisito= r): def __init__(self, prefix): QAPISchemaModularCVisitor.__init__( self, prefix, 'qapi-types', ' * Schema-defined QAPI types', - __doc__) - self._add_system_module(None, ' * Built-in QAPI types') + ' * Built-in QAPI types', __doc__) + + def _begin_system_module(self, name): self._genc.preamble_add(mcgen(''' #include "qemu/osdep.h" #include "qapi/dealloc-visitor.h" diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index c72f2bc5c0..4efce62b0c 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -285,8 +285,9 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisit= or): def __init__(self, prefix): QAPISchemaModularCVisitor.__init__( self, prefix, 'qapi-visit', ' * Schema-defined QAPI visitors', - __doc__) - self._add_system_module(None, ' * Built-in QAPI visitors') + ' * Built-in QAPI visitors', __doc__) + + def _begin_system_module(self, name): self._genc.preamble_add(mcgen(''' #include "qemu/osdep.h" #include "qapi/error.h" @@ -296,8 +297,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisit= or): #include "qapi/visitor.h" #include "qapi/qapi-builtin-types.h" =20 -''', - prefix=3Dprefix)) +''')) =20 def _begin_user_module(self, name): types =3D self._module_basename('qapi-types', name) --=20 2.21.1