Enable -cpu <cpu>,help
v2 cover Enable -cpu <cpu>,help
Part 1 is a refactor/code motion patch for
qapi/machine target required for setup of
Part 2 which enables query-cpu-model-expansion
on all architectures
Part 3 implements the '<cpu>,help' feature
Limitations:
Currently only 'FULL' expansion queries are implemented since that's the only type enabled on the architectures that allow feature probing
Unlike the 'device,help' command, default values aren't printed
Dinah Baum (3):
qapi/machine-target: refactor machine-target cpu, qapi, target/arm, i386, s390x: Generalize
query-cpu-model-expansion
cpu, qdict, vl: Enable printing options for CPU type
MAINTAINERS | 1 + cpu.c | 61 +++++++++++++++ include/exec/cpu-common.h | 10 +++ include/qapi/qmp/qdict.h | 2 + qapi/machine-target-common.json | 130 +++++++++++++++++++++++++++++++ qapi/machine-target.json | 129 +----------------------------- qapi/meson.build | 1 + qemu-options.hx | 7 +- qobject/qdict.c | 5 ++ softmmu/vl.c | 36 ++++++++- target/arm/arm-qmp-cmds.c | 7 +- target/arm/cpu.h | 7 +- target/i386/cpu-sysemu.c | 7 +- target/i386/cpu.h | 6 ++ target/s390x/cpu.h | 7 ++ target/s390x/cpu_models_sysemu.c | 6 +- 16 files changed, 278 insertions(+), 144 deletions(-) create mode 100644 qapi/machine-target-common.json
Signature · 1 line
2.30.2
PATCH v2 1/3 qapi/machine-target: refactor machine-target
Moved architecture agnostic data types to their own file to avoid "attempt to use poisoned TARGET_*" error that results when including qapi header with commands that aren't defined for all architectures. Required to implement enabling query-cpu-model-expansion on all architectures
--- MAINTAINERS | 1 + qapi/machine-target-common.json | 79 +++++++++++++++++++++++++++++++++ qapi/machine-target.json | 73 +----------------------------- qapi/meson.build | 1 + 4 files changed, 82 insertions(+), 72 deletions(-) create mode 100644 qapi/machine-target-common.json
MAINTAINERS +1 -0
@@ -1750,6 +1750,7 @@ F: hw/core/numa.c F: hw/cpu/cluster.c F: qapi/machine.json F: qapi/machine-target.json +F: qapi/machine-target-common.json F: include/hw/boards.h F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h
qapi/machine-target-common.json new file +79 -0
79 lines not on this page · raw message
qapi/machine-target.json +1 -72
79 lines not on this page · raw message
qapi/meson.build +1 -0
@@ -38,6 +38,7 @@ qapi_all_modules = [ 'job', 'machine', 'machine-target', + 'machine-target-common', 'migration', 'misc', 'misc-target',
Signature · 1 line
2.30.2
Re: [PATCH v2 1/3] qapi/machine-target: refactor machine-target
Quoted 21 lines · Dinah Baum
Moved architecture agnostic data types to their own file to avoid "attempt to use poisoned TARGET_*" error that results when including qapi header with commands that aren't defined for all architectures. Required to implement enabling
query-cpu-model-expansionon all architecturesSigned-off-by Dinah Baum <[email protected]>--- MAINTAINERS | 1 + qapi/machine-target-common.json | 79 +++++++++++++++++++++++++++++++++ qapi/machine-target.json | 73 +----------------------------- qapi/meson.build | 1 + 4 files changed, 82 insertions(+), 72 deletions(-)create mode 100644
qapi/machine-target-common.jsonqapi/meson.build +0
-0
qapi/meson.build qapi_all_modules = [ · line 44
Quoted 7 lines
qapi/meson.build +1
-0@@ -38,6 +38,7 @@ qapi_all_modules = [ 'job', 'machine', 'machine-target', + 'machine-target-common', 'migration', 'misc', 'misc-target',
Eh, this reminds me of
https://lore.kernel.org/qemu-devel/[email protected]/
I wonder between -common / -any / -all. Anyhow,
PATCH v2 2/3 cpu, qapi, target/arm, i386, s390x: Generalize query-cpu-model-expansion
In reply to Dinah BaumThis patch enables 'query-cpu-model-expansion' on all architectures. Only architectures that implement the command will return results, others will return an error message as before.
This patch lays the groundwork for parsing a -cpu cpu,help option as specified in
https://gitlab.com/qemu-project/qemu/-/issues/1480
--- cpu.c | 20 ++++++++++++ include/exec/cpu-common.h | 8 +++++ qapi/machine-target-common.json | 51 +++++++++++++++++++++++++++++ qapi/machine-target.json | 56 -------------------------------- target/arm/arm-qmp-cmds.c | 7 ++-- target/arm/cpu.h | 7 +++- target/i386/cpu-sysemu.c | 7 ++-- target/i386/cpu.h | 6 ++++ target/s390x/cpu.h | 7 ++++ target/s390x/cpu_models_sysemu.c | 6 ++-- 10 files changed, 108 insertions(+), 67 deletions(-)
cpu.c +20 -0
@@ -291,6 +291,26 @@ void list_cpus(const char *optarg)#endif } +CpuModelExpansionInfo *get_cpu_model_expansion_info (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp) +{ +/* XXX: implement cpu_model_expansion for targets that still miss it */ +#if defined(cpu_model_expansion) +return cpu_model_expansion (type, model, errp); +#else +error_setg (errp,"Could not query cpu model information" ); +return NULL ; +#endif +} + +CpuModelExpansionInfo *qmp_query_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp) +{ +return get_cpu_model_expansion_info (type, model, errp); +} +#if defined(CONFIG_USER_ONLY )void tb_invalidate_phys_addr (target_ulong addr) {
include/exec/cpu-common.h +8 -0
@@ -7,6 +7,8 @@#include "exec/hwaddr.h" #endif +#include "qapi/qapi-commands-machine-target-common.h" +/** * vaddr: * Type wide enough to contain any #target_ulong virtual address.
@@ -166,5 +168,11 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,extern int singlestep;void list_cpus (const char *optarg); +typedef void (*cpu_model_expansion_func )(CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp); +CpuModelExpansionInfo *get_cpu_model_expansion_info (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp);#endif /* CPU_COMMON_H */
qapi/machine-target-common.json +51 -0
54 lines not on this page · raw message
qapi/machine-target.json +0 -56
62 lines not on this page · raw message
target/arm/arm-qmp-cmds.c +4 -3
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "cpu.h" #include "hw/boards.h" #include "kvm_arm.h" #include "qapi/error.h"
@@ -99,9 +100,9 @@ static const char *cpu_model_advertised_features[] = { NULL }; -CpuModelExpansionInfo *qmp_query_cpu_model_expansion (CpuModelExpansionType type, -CpuModelInfo *model, -Error **errp) +CpuModelExpansionInfo *get_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp) {CpuModelExpansionInfo *expansion_info;const QDict *qdict_in =NULL ;
target/arm/cpu.h +6 -1
@@ -2660,7 +2660,12 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync);#define TYPE_ARM_HOST_CPU "host-" TYPE_ARM_CPU#define cpu_list arm_cpu_list - +#ifdef CONFIG_SOFTMMU +CpuModelExpansionInfo *get_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp); +#define cpu_model_expansion get_cpu_model_expansion +#endif /* ARM has the following "translation regimes" (as the ARM ARM calls them): * * If EL3 is 64-bit:
target/i386/cpu-sysemu.c +3 -4
@@ -176,10 +176,9 @@ out:return xc; } -CpuModelExpansionInfo * -qmp_query_cpu_model_expansion (CpuModelExpansionType type, -CpuModelInfo *model, -Error **errp) +CpuModelExpansionInfo *get_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp) {X86CPU *xc =NULL ;Error *err =NULL ;
target/i386/cpu.h +6 -0
@@ -2209,6 +2209,12 @@ uint64_t cpu_get_tsc(CPUX86State *env);#endif #define cpu_list x86_cpu_list +#ifdef CONFIG_SOFTMMU +CpuModelExpansionInfo *get_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp); +#define cpu_model_expansion get_cpu_model_expansion +#endif /* MMU modes definitions */ #define MMU_KSMAP_IDX 0
target/s390x/cpu.h +7 -0
@@ -799,6 +799,13 @@ void s390_cpu_list(void);void s390_set_qemu_cpu_model (uint16_t type,uint8_t gen,uint8_t ec_ga,const S390FeatInit feat_init); +#ifdef CONFIG_SOFTMMU +/* cpu_models-sysemu.c */ +CpuModelExpansionInfo *get_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp); +#define cpu_model_expansion get_cpu_model_expansion +#endif /* helper.c */ #define S390_CPU_TYPE_SUFFIX "-" TYPE_S390_CPU
target/s390x/cpu_models_sysemu.c +3 -3
@@ -213,9 +213,9 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model, } } -CpuModelExpansionInfo *qmp_query_cpu_model_expansion (CpuModelExpansionType type, -CpuModelInfo *model, -Error **errp) +CpuModelExpansionInfo *get_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp) {Error *err =NULL ;CpuModelExpansionInfo *expansion_info =NULL ;
Signature · 1 line
2.30.2
PATCH v2 3/3 cpu, qdict, vl: Enable printing options for CPU type
In reply to Dinah BaumChange parsing of -cpu argument to allow -cpu cpu,help to print options for the CPU type similar to how the '-device' option works.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1480
--- cpu.c | 41 +++++++++++++++++++++++++++++++++++++++ include/exec/cpu-common.h | 2 ++ include/qapi/qmp/qdict.h | 2 ++ qemu-options.hx | 7 ++++--- qobject/qdict.c | 5 +++++ softmmu/vl.c | 36 ++++++++++++++++++++++++++++++++-- 6 files changed, 88 insertions(+), 5 deletions(-)
cpu.c +41 -0
@@ -23,7 +23,9 @@#include "exec/target_page.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" +#include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/qemu-print.h" #include "migration/vmstate.h" #ifdef CONFIG_USER_ONLY #include "qemu.h"
@@ -42,6 +44,8 @@#include "hw/core/accel-cpu.h" #include "trace/trace-root.h" #include "qemu/accel.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qobject.h" uintptr_t qemu_host_page_size;intptr_t qemu_host_page_mask;
@@ -311,6 +315,43 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,return get_cpu_model_expansion_info (type, model, errp); } +void list_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model, +Error **errp) +{ +CpuModelExpansionInfo *expansion_info; +QDict *qdict; +QDictEntry *qdict_entry; +const char *key; +QObject *obj; +QType q_type; +GPtrArray *array; +int i; +const char *type_name; + + expansion_info =get_cpu_model_expansion_info (type, model, errp); +if (expansion_info) { + qdict =qobject_to (QDict, expansion_info->model->props); +if (qdict) { +qemu_printf ("%s features:\n" , model->name); + array =g_ptr_array_new (); +for (qdict_entry = (QDictEntry *)qdict_first (qdict); qdict_entry; + qdict_entry = (QDictEntry *)qdict_next (qdict, qdict_entry)) { +g_ptr_array_add (array, qdict_entry); + } +g_ptr_array_sort (array, (GCompareFunc )dict_key_compare); +for (i =0 ; i < array->len; i++) { + qdict_entry = array->pdata[i]; + key =qdict_entry_key (qdict_entry); + obj =qdict_get (qdict, key); + q_type =qobject_type (obj); + type_name =QType_str (q_type); +qemu_printf (" %s=<%s>\n" , key, type_name); + } + } + } +} +#if defined(CONFIG_USER_ONLY )void tb_invalidate_phys_addr (target_ulong addr) {
include/exec/cpu-common.h +2 -0
@@ -174,5 +174,7 @@ typedef void (*cpu_model_expansion_func)(CpuModelExpansionType type,CpuModelExpansionInfo *get_cpu_model_expansion_info (CpuModelExpansionType type,CpuModelInfo *model,Error **errp); +void list_cpu_model_expansion (CpuModelExpansionType type, +CpuModelInfo *model,Error **errp);#endif /* CPU_COMMON_H */
include/qapi/qmp/qdict.h +2 -0
@@ -68,4 +68,6 @@ const char *qdict_get_try_str(const QDict *qdict, const char *key);QDict *qdict_clone_shallow (const QDict *src); +int dict_key_compare (QDictEntry **entry1,QDictEntry **entry2); +#endif /* QDICT_H */
qemu-options.hx +4 -3
@@ -169,11 +169,12 @@ SRST ERST DEF("cpu", HAS_ARG, QEMU_OPTION_cpu, - "-cpu cpu select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL) + "-cpu cpu select CPU ('-cpu help' for list)\n" + " use '-cpu cpu,help' to print possible properties\n", QEMU_ARCH_ALL) SRST ``-cpu model`` - Select CPU model (``-cpu help`` for list and additional feature - selection) + Select CPU model (``-cpu help`` and ``-cpu cpu,help``) for list and additional feature + selection ERST DEF("accel", HAS_ARG, QEMU_OPTION_accel,
qobject/qdict.c +5 -0
@@ -447,3 +447,8 @@ void qdict_unref(QDict *q) {qobject_unref (q); } + +int dict_key_compare (QDictEntry **entry1,QDictEntry **entry2) +{ +return g_strcmp0 (qdict_entry_key (*entry1),qdict_entry_key (*entry2)); +}
softmmu/vl.c +34 -2
@@ -500,6 +500,15 @@ static QemuOptsList qemu_action_opts = { }, }; +static QemuOptsList qemu_cpu_opts = { + .name ="cpu" , + .implied_opt_name ="cpu" , + .head =QTAILQ_HEAD_INITIALIZER (qemu_cpu_opts.head), + .desc = { + {/* end of list */ } + }, +}; +const char *qemu_get_vm_name (void ) {return qemu_name;
@@ -1147,6 +1156,26 @@ static int device_init_func(void *opaque, QemuOpts *opts, Error **errp)return 0 ; } +static int cpu_help_func (void *opaque,QemuOpts *opts,Error **errp) +{ +CpuModelInfo *model; + +if (cpu_option &&is_help_option (cpu_option)) { +list_cpus (cpu_option); +return 1 ; + } + +if (!cpu_option || !qemu_opt_has_help_opt (opts)) { +return 0 ; + } + + model =g_new0 (CpuModelInfo,1 ); + model->name = (char *)qemu_opt_get (opts,"cpu" ); +/* TODO: handle other expansion cases */ +list_cpu_model_expansion (CPU_MODEL_EXPANSION_TYPE_FULL , model, errp); +return 1 ; +} +static int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp) {Error *local_err =NULL ;
@@ -2431,8 +2460,9 @@ static void qemu_process_help_options(void)* type and the user did not specify one, so that the user doesn't need * to say '-cpu help -machine something'. */ -if (cpu_option &&is_help_option (cpu_option)) { -list_cpus (cpu_option); +Error *errp =NULL ; +if (qemu_opts_foreach (qemu_find_opts ("cpu" ), + cpu_help_func,NULL , &errp)) {exit (0 ); }
@@ -2672,6 +2702,7 @@ void qemu_init(int argc, char **argv)qemu_add_opts (&qemu_semihosting_config_opts);qemu_add_opts (&qemu_fw_cfg_opts);qemu_add_opts (&qemu_action_opts); +qemu_add_opts (&qemu_cpu_opts);module_call_init (MODULE_INIT_OPTS );error_init (argv[0 ]);
@@ -2723,6 +2754,7 @@ void qemu_init(int argc, char **argv)switch (popt->index) {case QEMU_OPTION_cpu:/* hw initialization will check this */ +qemu_opts_parse_noisily (qemu_find_opts ("cpu" ), optarg, true); cpu_option = optarg;break ;case QEMU_OPTION_hda:
Signature · 1 line
2.30.2
Friendly ping for code review on this patch series.
Full series:
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
-DInah
Quoted 45 lines · Dinah Baum
Part 1 is a refactor/code motion patch for
qapi/machine target required for setup ofPart 2 which enables query-cpu-model-expansion
on all architecturesPart 3 implements the '<cpu>,help' feature
Limitations:
Currently only 'FULL' expansion queries are implemented since that's the only type enabled on the architectures that allow feature probingUnlike the 'device,help' command, default values aren't printed
Dinah Baum (3):
qapi/machine-target: refactor machine-target cpu, qapi, target/arm, i386, s390x: Generalize
query-cpu-model-expansion
cpu, qdict, vl: Enable printing options for CPU typeMAINTAINERS | 1 + cpu.c | 61 +++++++++++++++ include/exec/cpu-common.h | 10 +++ include/qapi/qmp/qdict.h | 2 + qapi/machine-target-common.json | 130 +++++++++++++++++++++++++++++++ qapi/machine-target.json | 129 +----------------------------- qapi/meson.build | 1 + qemu-options.hx | 7 +- qobject/qdict.c | 5 ++ softmmu/vl.c | 36 ++++++++- target/arm/arm-qmp-cmds.c | 7 +- target/arm/cpu.h | 7 +- target/i386/cpu-sysemu.c | 7 +- target/i386/cpu.h | 6 ++ target/s390x/cpu.h | 7 ++ target/s390x/cpu_models_sysemu.c | 6 +- 16 files changed, 278 insertions(+), 144 deletions(-) create mode 100644 qapi/machine-target-common.json--
2.30.2