| Message ID | 1424183053-4310-12-git-send-email-mimu@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 02/17/2015 07:24 AM, Michael Mueller wrote: > This patch implements a new QMP request named 'query-cpu-model'. > It returns the cpu model of cpu 0 and its backing accelerator. > > request: > {"execute" : "query-cpu-model" } > > answer: > {"return" : {"name": "2827-ga2", "accelerator": "kvm" }} > > Alias names are resolved to their respective machine type and GA names > already during cpu instantiation. Thus, also a cpu model like 'host' > which is implemented as alias will return its normalized cpu model name. > > Furthermore the patch implements the following functions: > > - s390_cpu_typename(), returns the currently selected cpu type name or NULL > - s390_cpu_models_used(), returns true if S390 cpu models are in use > > Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> > --- > > +## > +# @CpuModelInfo: > +# > +# Virtual CPU model definition. > +# > +# @name: the name of the CPU model definition > +# > +# Since: 2.3.0 > +## > +{ 'type': 'CpuModelInfo', > + 'data': { 'name': 'str', '*accelerator': 'AccelId' } } You didn't document '*accelerator', including mention that it is optional (why would it not be output always?). > + > +## > +# @query-cpu-model: > +# > +# Return to current virtual CPU model s/to/the/ > +# > +# Returns: CpuModelInfo > +# > +# Since: 2.3.0 We aren't very consistent on '2.3' vs. '2.3.0', so I won't complain about that. > +## > +{ 'command': 'query-cpu-model', 'returns': 'CpuModelInfo' } Seems reasonable from the interface point of view; I have not closely reviewed the implementation.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Tue, 17 Feb 2015 11:03:11 -0700 Eric Blake <eblake@redhat.com> wrote: > On 02/17/2015 07:24 AM, Michael Mueller wrote: > > This patch implements a new QMP request named 'query-cpu-model'. > > It returns the cpu model of cpu 0 and its backing accelerator. > > > > request: > > {"execute" : "query-cpu-model" } > > > > answer: > > {"return" : {"name": "2827-ga2", "accelerator": "kvm" }} > > > > Alias names are resolved to their respective machine type and GA names > > already during cpu instantiation. Thus, also a cpu model like 'host' > > which is implemented as alias will return its normalized cpu model name. > > > > Furthermore the patch implements the following functions: > > > > - s390_cpu_typename(), returns the currently selected cpu type name or NULL > > - s390_cpu_models_used(), returns true if S390 cpu models are in use > > > > Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> > > --- > > > > +## > > +# @CpuModelInfo: > > +# > > +# Virtual CPU model definition. > > +# > > +# @name: the name of the CPU model definition > > +# > > +# Since: 2.3.0 > > +## > > +{ 'type': 'CpuModelInfo', > > + 'data': { 'name': 'str', '*accelerator': 'AccelId' } } > > You didn't document '*accelerator', including mention that it is > optional (why would it not be output always?). Right, as it is a new command and all cpus once implementing it have an associated accelerator there is no point in making it optional. Will add a comment as well. > > > + > > +## > > +# @query-cpu-model: > > +# > > +# Return to current virtual CPU model > > s/to/the/ yep > > > +# > > +# Returns: CpuModelInfo > > +# > > +# Since: 2.3.0 > > We aren't very consistent on '2.3' vs. '2.3.0', so I won't complain > about that. But you seem to prefer major and minor only, so I will skip the trailing 0. > > > +## > > +{ 'command': 'query-cpu-model', 'returns': 'CpuModelInfo' } > > Seems reasonable from the interface point of view; I have not closely > reviewed the implementation. > Thanks Michael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJU5E/fAAoJELPcPLQSJsKQYksP/inWhcSnQF6WgNTaF2qsEqyG 6kRyAwfVID9k0Rh1Eh3fDKbDDrtXe1pB3dbHlX6JWWrDCQCzfFxbRDElK3lX4k1g ryAi9ZRPZ7TB88eGIS66vQ4J/O9WWe/I7tzoX2yeFcMRNa9+8dpyluPHWNYbeN6f KkzQy15PabCiggwQuDfm+X4jiV7HtIdxRVNuOJV4j2U8p6Wp5YaZMEp8MJQ2tDMe Uion91VZ2izLQ/rn+QIb1F28om03LWfh47sKzam9l9oomFglGhmHXkEktL+KCQTK MSUQOiIK3rSzZiFq5dsjIAOo1bkrjYpPxUfxq0xDjreJoGkd1sbtQ663QHG0RUTT 1G0BNKHxNggkxoxyChaEYWopNyZ2wMEn3XBaVHvnfDqDyymsWo3nAQVWIMwFpHth vSfBLY3CJnAW4HnDiaV3+sNDlFZlttzPE5jVXibR98sCdQORNEpCt9frdu1AToGB MCiAwJMc1qescJMghsogCUzG9ElA7wbvGIv+e/uEGj7LB/1H0ZMIpN/QU9NDd3Fi XpldGvPLIWRJq7/l8c6/KNg8SbTn1prtGZ1pKNOlkmn+BeEQjcihEmGOStoWny48 1hT08enhBJ9skXvWlGTvYBlohQ6vERwZ5B9E4tmSeLRQG+4YkE3JTyb0FJJScBoV l1X+PmwiT2AfeXLlDHlm =6Qmi -----END PGP SIGNATURE-----
diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 54b36c1..86344a2 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -37,5 +37,6 @@ int kvm_available(void); int xen_available(void); CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp); +CpuModelInfo *arch_query_cpu_model(Error **errp); #endif diff --git a/qapi-schema.json b/qapi-schema.json index 4d237c8..9431fc2 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2507,6 +2507,29 @@ ## { 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'] } +## +# @CpuModelInfo: +# +# Virtual CPU model definition. +# +# @name: the name of the CPU model definition +# +# Since: 2.3.0 +## +{ 'type': 'CpuModelInfo', + 'data': { 'name': 'str', '*accelerator': 'AccelId' } } + +## +# @query-cpu-model: +# +# Return to current virtual CPU model +# +# Returns: CpuModelInfo +# +# Since: 2.3.0 +## +{ 'command': 'query-cpu-model', 'returns': 'CpuModelInfo' } + # @AddfdInfo: # # Information about a file descriptor that was added to an fd set. diff --git a/qmp-commands.hx b/qmp-commands.hx index a85d847..98bfedd 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3392,6 +3392,12 @@ EQMP }, { + .name = "query-cpu-model", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_cpu_model, + }, + + { .name = "query-target", .args_type = "", .mhandler.cmd_new = qmp_marshal_input_query_target, diff --git a/qmp.c b/qmp.c index 6b2c4be..d32abbc 100644 --- a/qmp.c +++ b/qmp.c @@ -568,6 +568,11 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) return arch_query_cpu_definitions(errp); } +CpuModelInfo *qmp_query_cpu_model(Error **errp) +{ + return arch_query_cpu_model(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/Makefile.objs b/stubs/Makefile.objs index fd7a489..45daa92 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -1,4 +1,5 @@ stub-obj-y += arch-query-cpu-def.o +stub-obj-y += arch-query-cpu-mod.o stub-obj-y += bdrv-commit-all.o stub-obj-y += chr-baum-init.o stub-obj-y += chr-msmouse.o diff --git a/stubs/arch-query-cpu-mod.c b/stubs/arch-query-cpu-mod.c new file mode 100644 index 0000000..90ebd08 --- /dev/null +++ b/stubs/arch-query-cpu-mod.c @@ -0,0 +1,9 @@ +#include "qemu-common.h" +#include "sysemu/arch_init.h" +#include "qapi/qmp/qerror.h" + +CpuModelInfo *arch_query_cpu_model(Error **errp) +{ + error_set(errp, QERR_UNSUPPORTED); + return NULL; +} diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c index 9f40998..4d03adc 100644 --- a/target-s390x/cpu-models.c +++ b/target-s390x/cpu-models.c @@ -110,6 +110,7 @@ typedef struct ParmAddrAddrAccel { } ParmAddrAddrAccel; static GSList *s390_cpu_aliases; +static const char *selected_cpu_typename; /* compare order of two cpu classes for ascending sort */ gint s390_cpu_class_asc_order_compare(gconstpointer a, gconstpointer b) @@ -631,3 +632,27 @@ bool s390_probe_mode(void) return false; } +/** + * s390_cpu_typename - get name of selected cpu class type + * + * Returns: address to name of selected cpu class type + * NULL if no cpu class type has been selected yet + */ +const char *s390_cpu_typename(void) +{ + return selected_cpu_typename; +} + +/** + * s390_cpu_models_used - indicates that cpus with model properties + * are in use + * + * Returns: true if a cpu model type name has been selected + * false if either no cpu class type was selected yet or the + * selected type is TYPE_S390_CPU + */ +bool s390_cpu_models_used(void) +{ + return s390_cpu_typename() && strcmp(s390_cpu_typename(), TYPE_S390_CPU); +} + diff --git a/target-s390x/cpu-models.h b/target-s390x/cpu-models.h index be94667..23ac2c4 100644 --- a/target-s390x/cpu-models.h +++ b/target-s390x/cpu-models.h @@ -110,6 +110,8 @@ void s390_cpu_list_entry(gpointer data, gpointer user_data); bool s390_cpu_classes_initialized(void); bool s390_test_facility(S390CPUClass *cc, unsigned long nr); bool s390_probe_mode(void); +const char *s390_cpu_typename(void); +bool s390_cpu_models_used(void); /* * bits 0-7 : CMOS generation diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index d27832b..d98578b 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -37,6 +37,11 @@ #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; +static inline char *strdup_s390_cpu_name(S390CPUClass *cc) +{ + return g_strdup_printf("%04x-ga%u", cc->proc->type, cc->mach->ga); +} + /* generate CPU information for cpu -? */ void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) { @@ -74,6 +79,33 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) return entry; } + +CpuModelInfo *arch_query_cpu_model(Error **errp) +{ + CpuModelInfo *info; + S390CPUClass *cc; + + if (!s390_cpu_models_used()) { + return NULL; + } + info = g_try_new0(CpuModelInfo, 1); + if (!info) { + return NULL; + } + cc = S390_CPU_CLASS(object_class_by_name(s390_cpu_typename())); + info->name = strdup_s390_cpu_name(cc); + if (!info->name) { + g_free(info); + return NULL; + } + info->accelerator = ACCEL_ID_MAX; + if (kvm_enabled()) { + info->accelerator = ACCEL_ID_KVM; + } + info->has_accelerator = (info->accelerator != ACCEL_ID_MAX); + + return info; +} #endif static void s390_cpu_set_pc(CPUState *cs, vaddr value)
This patch implements a new QMP request named 'query-cpu-model'. It returns the cpu model of cpu 0 and its backing accelerator. request: {"execute" : "query-cpu-model" } answer: {"return" : {"name": "2827-ga2", "accelerator": "kvm" }} Alias names are resolved to their respective machine type and GA names already during cpu instantiation. Thus, also a cpu model like 'host' which is implemented as alias will return its normalized cpu model name. Furthermore the patch implements the following functions: - s390_cpu_typename(), returns the currently selected cpu type name or NULL - s390_cpu_models_used(), returns true if S390 cpu models are in use Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> --- include/sysemu/arch_init.h | 1 + qapi-schema.json | 23 +++++++++++++++++++++++ qmp-commands.hx | 6 ++++++ qmp.c | 5 +++++ stubs/Makefile.objs | 1 + stubs/arch-query-cpu-mod.c | 9 +++++++++ target-s390x/cpu-models.c | 25 +++++++++++++++++++++++++ target-s390x/cpu-models.h | 2 ++ target-s390x/cpu.c | 32 ++++++++++++++++++++++++++++++++ 9 files changed, 104 insertions(+) create mode 100644 stubs/arch-query-cpu-mod.c