From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkBZe-0000iE-M3 for qemu-devel@nongnu.org; Tue, 22 Aug 2017 11:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkBZb-0005Wk-L5 for qemu-devel@nongnu.org; Tue, 22 Aug 2017 11:58:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkBZb-0005W8-B4 for qemu-devel@nongnu.org; Tue, 22 Aug 2017 11:58:35 -0400 From: Markus Armbruster References: <20170822132255.23945-1-marcandre.lureau@redhat.com> <20170822132255.23945-52-marcandre.lureau@redhat.com> <20170822162400.51f07d89.cohuck@redhat.com> Date: Tue, 22 Aug 2017 17:58:28 +0200 In-Reply-To: (David Hildenbrand's message of "Tue, 22 Aug 2017 16:25:42 +0200") Message-ID: <87d17n61cr.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 51/54] qapi: make s390 commands depend on TARGET_S390X List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: Cornelia Huck , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Alexander Graf , qemu-devel@nongnu.org, Paolo Bonzini , "Dr. David Alan Gilbert" , Richard Henderson David Hildenbrand writes: > On 22.08.2017 16:24, Cornelia Huck wrote: >> On Tue, 22 Aug 2017 15:22:52 +0200 >> Marc-Andr=C3=A9 Lureau wrote: >>=20 >>> Signed-off-by: Marc-Andr=C3=A9 Lureau >>> --- >>> qapi-schema.json | 10 +++++++--- >>> include/sysemu/arch_init.h | 6 ------ >>> monitor.c | 14 -------------- >>> qmp.c | 14 -------------- >>> stubs/arch-query-cpu-model-baseline.c | 12 ------------ >>> stubs/arch-query-cpu-model-comparison.c | 12 ------------ >>> target/s390x/cpu_models.c | 4 ++-- >>> stubs/Makefile.objs | 2 -- >>> 8 files changed, 9 insertions(+), 65 deletions(-) >>> delete mode 100644 stubs/arch-query-cpu-model-baseline.c >>> delete mode 100644 stubs/arch-query-cpu-model-comparison.c >>> >>> diff --git a/qapi-schema.json b/qapi-schema.json >>> index 58574b3044..d4e1552ddc 100644 >>> --- a/qapi-schema.json >>> +++ b/qapi-schema.json >>> @@ -3577,7 +3577,8 @@ >>> # >>> ## >>> { 'command': 'dump-skeys', >>> - 'data': { 'filename': 'str' } } >>> + 'data': { 'filename': 'str' }, >>> + 'if': ['defined(NEED_CPU_H)', 'defined(TARGET_S390X)']} >>=20 >> I agree with making this s390x specific... >>>=20=20 >>> ## >>> # @netdev_add: >>> @@ -4621,7 +4622,9 @@ >>> ## >>> { 'command': 'query-cpu-model-comparison', >>> 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' }, >>> - 'returns': 'CpuModelCompareInfo' } >>> + 'returns': 'CpuModelCompareInfo', >>> + 'if': ['defined(NEED_CPU_H)', 'defined(TARGET_S390X)']} >>> + >>>=20=20 >>> ## >>> # @CpuModelBaselineInfo: >>> @@ -4673,7 +4676,8 @@ >>> { 'command': 'query-cpu-model-baseline', >>> 'data': { 'modela': 'CpuModelInfo', >>> 'modelb': 'CpuModelInfo' }, >>> - 'returns': 'CpuModelBaselineInfo' } >>> + 'returns': 'CpuModelBaselineInfo', >>> + 'if': ['defined(NEED_CPU_H)', 'defined(TARGET_S390X)']} >>=20 >> ...but I'm not sure about the cpu model stuff. Wasn't the idea to move >> to this model for all architectures later? (Given that we have stubs >> for architectures not implementing this, instead of ifdeffing it in >> monitor.c) >>=20 > > +1, not architecture specific (in contrast to skey), simply not > supported _yet_ on other architectures. Yes, but Marc-Andr=C3=A9's patch makes the "not supported yet" information available in query-qmp-schema. Carrying such information is pretty much the point of schema introspection. We could add a comment explaining this command isn't target-specific, but just happens not to be implemented for some targets. Would that help?