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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F114FC7EE23 for ; Mon, 27 Feb 2023 12:52:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWcz0-0008Bb-W2; Mon, 27 Feb 2023 07:51:59 -0500 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 1pWcyv-0008An-EP; Mon, 27 Feb 2023 07:51:54 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWcys-0005Sd-PX; Mon, 27 Feb 2023 07:51:52 -0500 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31RAxjjL026690; Mon, 27 Feb 2023 12:51:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : subject : from : to : cc : date : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=pp1; bh=cduFZsxbHCwIMqUUdtVBrltvaeYrlg4SYyh56QtzuDg=; b=rtuaZ5d2EznAa+7KYVz4znyNTYfOn6eTg/102Y/pRg0N2+TZrRHw2/x826N8/V2zNL54 EEtEAdd1x53yQNUtGQHH4E8mbxxBZwmj+FF1qO5XI2i095NMHQzDh+DkPugiNCzaxOpM iy+s5mmHE0HUgdlZD+a/nSFZSg2hDLllZRLjRFmiMDIuI0j20Uq9TsZnTtxj+pXFLVs4 8oHf0QAMmMaQ+lYuW+p0jLOybyUK3H1b31hQPrwtOYzlYKjVlDMna+QU6rXO38D/n7g5 n1SczxHoZJbMP6pWfNniIgK4czdYBH1bLeNyJ6E8SIW77xOSYt6VWvXp58N4mFzVnxg0 ZQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p0u8qtpww-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Feb 2023 12:51:38 +0000 Received: from m0098410.ppops.net (m0098410.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 31RBlg62024254; Mon, 27 Feb 2023 12:51:38 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p0u8qtpq9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Feb 2023 12:51:38 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 31R4D83f031070; Mon, 27 Feb 2023 12:51:24 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma01fra.de.ibm.com (PPS) with ESMTPS id 3nybdfsefp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Feb 2023 12:51:23 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 31RCpKrZ61800788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Feb 2023 12:51:20 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 118D120043; Mon, 27 Feb 2023 12:51:20 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8CAD120040; Mon, 27 Feb 2023 12:51:19 +0000 (GMT) Received: from li-7e0de7cc-2d9d-11b2-a85c-de26c016e5ad.ibm.com (unknown [9.171.148.35]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 27 Feb 2023 12:51:19 +0000 (GMT) Message-ID: Subject: Re: [PATCH v16 08/11] qapi/s390x/cpu topology: set-cpu-topology monitor command From: Nina Schoetterl-Glausch To: Markus Armbruster Cc: Thomas Huth , Pierre Morel , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, borntraeger@de.ibm.com, pasic@linux.ibm.com, richard.henderson@linaro.org, david@redhat.com, cohuck@redhat.com, mst@redhat.com, pbonzini@redhat.com, kvm@vger.kernel.org, ehabkost@redhat.com, marcel.apfelbaum@gmail.com, eblake@redhat.com, seiden@linux.ibm.com, nrb@linux.ibm.com, frankja@linux.ibm.com, berrange@redhat.com, clg@kaod.org Date: Mon, 27 Feb 2023 13:51:19 +0100 In-Reply-To: <87v8jnqorg.fsf@pond.sub.org> References: <20230222142105.84700-1-pmorel@linux.ibm.com> <20230222142105.84700-9-pmorel@linux.ibm.com> <0a93eb0e-2552-07b7-2067-f46d542126f4@redhat.com> <9e1cbbe11ac1429335c288e817a21f19f8f4af87.camel@linux.ibm.com> <87v8jnqorg.fsf@pond.sub.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 (3.46.4-1.fc37) MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: y3-cCLFJ0hg8pXB5Np8e2y6j0ZCyYwR6 X-Proofpoint-GUID: D0OYw_YqB4zz-QV1Jqu5FvBI4kOSlMA_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-27_10,2023-02-27_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 adultscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=618 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302270097 Received-SPF: pass client-ip=148.163.156.1; envelope-from=nsg@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Mon, 2023-02-27 at 13:25 +0100, Markus Armbruster wrote: > Nina Schoetterl-Glausch writes: >=20 > > On Mon, 2023-02-27 at 08:59 +0100, Thomas Huth wrote: >=20 > [...] >=20 > > > I'm not sure whether double inclusion works with the QAPI parser (sin= ce this=20 > > > might code to be generated twice) ... have you tried? > >=20 > > I haven't, the documentation says: > >=20 > > > Include directives > > > ------------------ > > >=20 > > > Syntax:: > > >=20 > > > INCLUDE =3D { 'include': STRING } > > >=20 > > > The QAPI schema definitions can be modularized using the 'include' di= rective:: > > >=20 > > > { 'include': 'path/to/file.json' } > > >=20 > > > The directive is evaluated recursively, and include paths are relativ= e > > > to the file using the directive. Multiple includes of the same file > > > are idempotent. > >=20 > > Which is why I thought it should work, but I guess this is a statement = about > > including the same file twice in another file and not about including t= he same > > file from two files. >=20 > No, this is intended to say multiple inclusion is fine, regardless where > the include directives are. >=20 > An include directive has two effects: >=20 > 1. If the included file has not been included already, pull in its > contents. >=20 > 2. Insert #include in generated C. Example: qdev.json includes > qom.json. The generated qapi-*-qdev.h include qapi-types-qom.h. >=20 > Including any required modules, as recommended by qapi-code-gen.rst, > results in properly self-contained generated headers. Ok, thanks. Not sure if another phrasing would be better given the intended meaning is the way I read it initially. >=20 > > But then, as far as I can tell, the build system only builds qapi-schem= a.json, > > which includes all other files, so it could apply. >=20 > Yes, qapi-schema.json is the main module, which includes all the others. >=20 > In fact, it includes all the others *directly*. Why? >=20 > We generate documentation in source order. Included material gets > inserted right at the first inclusion; subsequent inclusions have no > effect. >=20 > If we put all first inclusions right into qapi-schema.json, the order of > things in documentation is visible right there, and won't change just > because we change inclusions deeper down. >=20 > Questions? CpuS390Entitlement would be useful in both machine.json and machine-target.= json because query-cpu-fast is defined in machine.json and set-cpu-topology is d= efined in machine-target.json. So then the question is where best to define CpuS390Entitlement. In machine.json and include machine.json in machine-target.json? Or define it in another file and include it from both? Thanks