From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diJfp-0002JK-MM for qemu-devel@nongnu.org; Thu, 17 Aug 2017 08:13:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diJfl-0001ak-Hc for qemu-devel@nongnu.org; Thu, 17 Aug 2017 08:13:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35300) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diJfl-0001ZQ-8l for qemu-devel@nongnu.org; Thu, 17 Aug 2017 08:13:13 -0400 From: Markus Armbruster References: <20170727154126.11339-1-marcandre.lureau@redhat.com> <20170727154126.11339-24-marcandre.lureau@redhat.com> Date: Thu, 17 Aug 2017 14:13:04 +0200 In-Reply-To: <20170727154126.11339-24-marcandre.lureau@redhat.com> (=?utf-8?Q?=22Marc-Andr=C3=A9?= Lureau"'s message of "Thu, 27 Jul 2017 17:41:23 +0200") Message-ID: <871soae6jz.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 23/26] qapi: make s390 commands depend on TARGET_S390X List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org, Alexander Graf , "Dr. David Alan Gilbert" , Paolo Bonzini , Richard Henderson , David Hildenbrand , Cornelia Huck , Eduardo Habkost Marc-Andr=C3=A9 Lureau writes: > 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 2361c13fc8..278d7e2aa3 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)']} Same technique as for TARGET_I386 in PATCH 22. See my review of it for how it works. >=20=20 > ## > # @netdev_add: > @@ -4621,7 +4622,9 @@ > ## > { 'command': 'query-cpu-model-comparison', > 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' }, Not your patch's fault: 'modela' sounds like the name of some high end escort service or something. The QAPI naming conventions want proper words connected with dashes: 'model-a' and 'model-b'. Although I wouldn't mind just 'a' and 'b'. This should've been caught in review. Too late to fix now, I'm afraid. > - '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=20 > ## > # @AddfdInfo: > diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h > index 8751c468ed..e9f1ea0cca 100644 > --- a/include/sysemu/arch_init.h > +++ b/include/sysemu/arch_init.h > @@ -35,11 +35,5 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Erro= r **errp); > CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionT= ype type, > CpuModelInfo *mode, > Error **errp); > -CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *model= a, > - CpuModelInfo *model= b, > - Error **errp); > -CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela, > - CpuModelInfo *modelb, > - Error **errp); >=20=20 > #endif > diff --git a/monitor.c b/monitor.c > index f3dafafa22..505ee5c58d 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -970,19 +970,12 @@ static void qmp_query_qmp_schema(QDict *qdict, QObj= ect **ret_data, > */ > static void qmp_unregister_commands_hack(void) > { > -#ifndef TARGET_S390X > - qmp_unregister_command(&qmp_commands, "dump-skeys"); > -#endif > #ifndef TARGET_ARM > qmp_unregister_command(&qmp_commands, "query-gic-capabilities"); > #endif > #if !defined(TARGET_S390X) && !defined(TARGET_I386) > qmp_unregister_command(&qmp_commands, "query-cpu-model-expansion"); > #endif > -#if !defined(TARGET_S390X) > - qmp_unregister_command(&qmp_commands, "query-cpu-model-baseline"); > - qmp_unregister_command(&qmp_commands, "query-cpu-model-comparison"); > -#endif > #if !defined(TARGET_PPC) && !defined(TARGET_ARM) && !defined(TARGET_I386= ) \ > && !defined(TARGET_S390X) > qmp_unregister_command(&qmp_commands, "query-cpu-definitions"); > @@ -4148,13 +4141,6 @@ QemuOptsList qemu_mon_opts =3D { > }, > }; >=20=20 > -#ifndef TARGET_S390X > -void qmp_dump_skeys(const char *filename, Error **errp) > -{ > - error_setg(errp, QERR_FEATURE_DISABLED, "dump-skeys"); > -} > -#endif > - > #ifndef TARGET_ARM > GICCapabilityList *qmp_query_gic_capabilities(Error **errp) > { > diff --git a/qmp.c b/qmp.c > index 90816ba283..7b6861846f 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -553,20 +553,6 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion= (CpuModelExpansionType type, > return arch_query_cpu_model_expansion(type, model, errp); > } >=20=20 > -CpuModelCompareInfo *qmp_query_cpu_model_comparison(CpuModelInfo *modela, > - CpuModelInfo *modelb, > - Error **errp) > -{ > - return arch_query_cpu_model_comparison(modela, modelb, errp); > -} > - > -CpuModelBaselineInfo *qmp_query_cpu_model_baseline(CpuModelInfo *modela, > - CpuModelInfo *modelb, > - Error **errp) > -{ > - return arch_query_cpu_model_baseline(modela, modelb, errp); > -} > - > void qmp_add_client(const char *protocol, const char *fdname, > bool has_skipauth, bool skipauth, bool has_tls, bool= tls, > Error **errp) > diff --git a/stubs/arch-query-cpu-model-baseline.c b/stubs/arch-query-cpu= -model-baseline.c > deleted file mode 100644 > index 094ec13c2c..0000000000 > --- a/stubs/arch-query-cpu-model-baseline.c > +++ /dev/null > @@ -1,12 +0,0 @@ > -#include "qemu/osdep.h" > -#include "qemu-common.h" > -#include "sysemu/arch_init.h" > -#include "qapi/qmp/qerror.h" > - > -CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela, > - CpuModelInfo *modelb, > - Error **errp) > -{ > - error_setg(errp, QERR_UNSUPPORTED); > - return NULL; > -} > diff --git a/stubs/arch-query-cpu-model-comparison.c b/stubs/arch-query-c= pu-model-comparison.c > deleted file mode 100644 > index d5486ae980..0000000000 > --- a/stubs/arch-query-cpu-model-comparison.c > +++ /dev/null > @@ -1,12 +0,0 @@ > -#include "qemu/osdep.h" > -#include "qemu-common.h" > -#include "sysemu/arch_init.h" > -#include "qapi/qmp/qerror.h" > - > -CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *model= a, > - CpuModelInfo *model= b, > - Error **errp) > -{ > - error_setg(errp, QERR_UNSUPPORTED); > - return NULL; > -} > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index fa1338fc72..cdff9cdd3b 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -559,7 +559,7 @@ static void list_add_feat(const char *name, void *opa= que) > *last =3D entry; > } >=20=20 > -CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *infoa, > +CpuModelCompareInfo *qmp_query_cpu_model_comparison(CpuModelInfo *infoa, > CpuModelInfo *infob, > Error **errp) > { > @@ -632,7 +632,7 @@ CpuModelCompareInfo *arch_query_cpu_model_comparison(= CpuModelInfo *infoa, > return compare_info; > } >=20=20 > -CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *infoa, > +CpuModelBaselineInfo *qmp_query_cpu_model_baseline(CpuModelInfo *infoa, > CpuModelInfo *infob, > Error **errp) > { > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > index 1b2bef99c9..049d389966 100644 > --- a/stubs/Makefile.objs > +++ b/stubs/Makefile.objs > @@ -1,7 +1,5 @@ > stub-obj-y +=3D arch-query-cpu-def.o > stub-obj-y +=3D arch-query-cpu-model-expansion.o > -stub-obj-y +=3D arch-query-cpu-model-comparison.o > -stub-obj-y +=3D arch-query-cpu-model-baseline.o > stub-obj-y +=3D bdrv-next-monitor-owned.o > stub-obj-y +=3D blk-commit-all.o > stub-obj-y +=3D blockdev-close-all-bdrv-states.o