Make qemu_cpu_opts also works for linux user mode. Notice, currently
qdev monitor is not included in linux user mode. We just output
current enabled extentions for RISC-V(without the hint to print all
properties with -device).

With this patch,
"""
qemu-riscv64 -cpu rv64,help
Enabled extensions:
	rv64_zicbom_zicboz_zicsr_zifencei_zihintpause_zawrs_zfa_zba_zbb_zbc_zbs_sstc_svadu
"""

Signed-off-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
---
 cpu.c                     | 24 ++++++++++++++++++++++++
 include/exec/cpu-common.h |  2 ++
 linux-user/main.c         | 10 ++++++++++
 softmmu/vl.c              | 24 ------------------------
 target/riscv/cpu.c        |  8 +++++---
 5 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/cpu.c b/cpu.c
index 712bd02684..590d75def0 100644
--- a/cpu.c
+++ b/cpu.c
@@ -47,6 +47,30 @@
 uintptr_t qemu_host_page_size;
 intptr_t qemu_host_page_mask;
 
+QemuOptsList qemu_cpu_opts = {
+    .name = "cpu",
+    .implied_opt_name = "cpu_model",
+    .head = QTAILQ_HEAD_INITIALIZER(qemu_cpu_opts.head),
+    .desc = {
+        { /* end of list */ }
+    },
+};
+
+int cpu_help_func(void *opaque, QemuOpts *opts, Error **errp)
+{
+    const char *cpu_model, *cpu_type;
+    cpu_model = qemu_opt_get(opts, "cpu_model");
+    if (!cpu_model) {
+        return 1;
+    }
+    if (!qemu_opt_has_help_opt(opts)) {
+        return 0;
+    }
+    cpu_type = cpu_type_by_name(cpu_model);
+    list_cpu_props((CPUState *)object_new(cpu_type));
+    return 1;
+}
+
 #ifndef CONFIG_USER_ONLY
 static int cpu_common_post_load(void *opaque, int version_id)
 {
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index b3160d9218..4d385436a5 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -168,4 +168,6 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
 void list_cpus(void);
 void list_cpu_props(CPUState *);
 
+int cpu_help_func(void *opaque, QemuOpts *opts, Error **errp);
+extern QemuOptsList qemu_cpu_opts;
 #endif /* CPU_COMMON_H */
diff --git a/linux-user/main.c b/linux-user/main.c
index 96be354897..c3ef84b1a7 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -362,6 +362,15 @@ static void handle_arg_cpu(const char *arg)
         list_cpus();
         exit(EXIT_FAILURE);
     }
+    QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("cpu"),
+                                             arg, true);
+    if (!opts) {
+        exit(1);
+    }
+    if (qemu_opts_foreach(qemu_find_opts("cpu"),
+                          cpu_help_func, NULL, NULL)) {
+        exit(0);
+    }
 }
 
 static void handle_arg_guest_base(const char *arg)
@@ -720,6 +729,7 @@ int main(int argc, char **argv, char **envp)
     cpu_model = NULL;
 
     qemu_add_opts(&qemu_trace_opts);
+    qemu_add_opts(&qemu_cpu_opts);
     qemu_plugin_add_opts();
 
     optind = parse_args(argc, argv);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index bc30f3954d..d6a395454a 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -218,15 +218,6 @@ static struct {
     { .driver = "virtio-vga-gl",        .flag = &default_vga       },
 };
 
-static QemuOptsList qemu_cpu_opts = {
-    .name = "cpu",
-    .implied_opt_name = "cpu_model",
-    .head = QTAILQ_HEAD_INITIALIZER(qemu_cpu_opts.head),
-    .desc = {
-        { /* end of list */ }
-    },
-};
-
 static QemuOptsList qemu_rtc_opts = {
     .name = "rtc",
     .head = QTAILQ_HEAD_INITIALIZER(qemu_rtc_opts.head),
@@ -1149,21 +1140,6 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
     return 0;
 }
 
-static int cpu_help_func(void *opaque, QemuOpts *opts, Error **errp)
-{
-    const char *cpu_model, *cpu_type;
-    cpu_model = qemu_opt_get(opts, "cpu_model");
-    if (!cpu_model) {
-        return 1;
-    }
-    if (!qemu_opt_has_help_opt(opts)) {
-        return 0;
-    }
-    cpu_type = cpu_type_by_name(cpu_model);
-    list_cpu_props((CPUState *)object_new(cpu_type));
-    return 1;
-}
-
 static int device_help_func(void *opaque, QemuOpts *opts, Error **errp)
 {
     return qdev_device_help(opts);
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index edcd34e62b..e4318fcc46 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -2229,15 +2229,17 @@ void riscv_cpu_list(void)
 void riscv_cpu_list_props(CPUState *cs)
 {
     char *enabled_isa;
-    RISCVCPU *cpu = RISCV_CPU(cs);
-    RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(cpu);
-    ObjectClass *oc = OBJECT_CLASS(mcc);
 
     enabled_isa = riscv_isa_string(RISCV_CPU(cs));
     qemu_printf("Enabled extensions:\n");
     qemu_printf("\t%s\n", enabled_isa);
+#ifndef CONFIG_USER_ONLY
+    RISCVCPU *cpu = RISCV_CPU(cs);
+    RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(cpu);
+    ObjectClass *oc = OBJECT_CLASS(mcc);
     qemu_printf("To get all configuable options for this cpu, use"
                 " -device %s,help\n", object_class_get_name(oc));
+#endif
 }
 
 #define DEFINE_CPU(type_name, initfn)      \
-- 
2.17.1

On 8/28/23 05:45, LIU Zhiwei wrote:
> Make qemu_cpu_opts also works for linux user mode. Notice, currently
> qdev monitor is not included in linux user mode. We just output
> current enabled extentions for RISC-V(without the hint to print all
> properties with -device).
> 
> With this patch,
> """
> qemu-riscv64 -cpu rv64,help
> Enabled extensions:
> 	rv64_zicbom_zicboz_zicsr_zifencei_zihintpause_zawrs_zfa_zba_zbb_zbc_zbs_sstc_svadu
> """
> 
> Signed-off-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
> ---


This is a similar to patch 5. Code LGTM but it's better to split the changes made in
the common code from the changes in a specific target.

What I suggest here is add a patch with the linux-user changes alone, then a second
patch with the target/riscv changes. Thanks,


Daniel


>   cpu.c                     | 24 ++++++++++++++++++++++++
>   include/exec/cpu-common.h |  2 ++
>   linux-user/main.c         | 10 ++++++++++
>   softmmu/vl.c              | 24 ------------------------
>   target/riscv/cpu.c        |  8 +++++---
>   5 files changed, 41 insertions(+), 27 deletions(-)
> 
> diff --git a/cpu.c b/cpu.c
> index 712bd02684..590d75def0 100644
> --- a/cpu.c
> +++ b/cpu.c
> @@ -47,6 +47,30 @@
>   uintptr_t qemu_host_page_size;
>   intptr_t qemu_host_page_mask;
>   
> +QemuOptsList qemu_cpu_opts = {
> +    .name = "cpu",
> +    .implied_opt_name = "cpu_model",
> +    .head = QTAILQ_HEAD_INITIALIZER(qemu_cpu_opts.head),
> +    .desc = {
> +        { /* end of list */ }
> +    },
> +};
> +
> +int cpu_help_func(void *opaque, QemuOpts *opts, Error **errp)
> +{
> +    const char *cpu_model, *cpu_type;
> +    cpu_model = qemu_opt_get(opts, "cpu_model");
> +    if (!cpu_model) {
> +        return 1;
> +    }
> +    if (!qemu_opt_has_help_opt(opts)) {
> +        return 0;
> +    }
> +    cpu_type = cpu_type_by_name(cpu_model);
> +    list_cpu_props((CPUState *)object_new(cpu_type));
> +    return 1;
> +}
> +
>   #ifndef CONFIG_USER_ONLY
>   static int cpu_common_post_load(void *opaque, int version_id)
>   {
> diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
> index b3160d9218..4d385436a5 100644
> --- a/include/exec/cpu-common.h
> +++ b/include/exec/cpu-common.h
> @@ -168,4 +168,6 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
>   void list_cpus(void);
>   void list_cpu_props(CPUState *);
>   
> +int cpu_help_func(void *opaque, QemuOpts *opts, Error **errp);
> +extern QemuOptsList qemu_cpu_opts;
>   #endif /* CPU_COMMON_H */
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 96be354897..c3ef84b1a7 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -362,6 +362,15 @@ static void handle_arg_cpu(const char *arg)
>           list_cpus();
>           exit(EXIT_FAILURE);
>       }
> +    QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("cpu"),
> +                                             arg, true);
> +    if (!opts) {
> +        exit(1);
> +    }
> +    if (qemu_opts_foreach(qemu_find_opts("cpu"),
> +                          cpu_help_func, NULL, NULL)) {
> +        exit(0);
> +    }
>   }
>   
>   static void handle_arg_guest_base(const char *arg)
> @@ -720,6 +729,7 @@ int main(int argc, char **argv, char **envp)
>       cpu_model = NULL;
>   
>       qemu_add_opts(&qemu_trace_opts);
> +    qemu_add_opts(&qemu_cpu_opts);
>       qemu_plugin_add_opts();
>   
>       optind = parse_args(argc, argv);
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index bc30f3954d..d6a395454a 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -218,15 +218,6 @@ static struct {
>       { .driver = "virtio-vga-gl",        .flag = &default_vga       },
>   };
>   
> -static QemuOptsList qemu_cpu_opts = {
> -    .name = "cpu",
> -    .implied_opt_name = "cpu_model",
> -    .head = QTAILQ_HEAD_INITIALIZER(qemu_cpu_opts.head),
> -    .desc = {
> -        { /* end of list */ }
> -    },
> -};
> -
>   static QemuOptsList qemu_rtc_opts = {
>       .name = "rtc",
>       .head = QTAILQ_HEAD_INITIALIZER(qemu_rtc_opts.head),
> @@ -1149,21 +1140,6 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
>       return 0;
>   }
>   
> -static int cpu_help_func(void *opaque, QemuOpts *opts, Error **errp)
> -{
> -    const char *cpu_model, *cpu_type;
> -    cpu_model = qemu_opt_get(opts, "cpu_model");
> -    if (!cpu_model) {
> -        return 1;
> -    }
> -    if (!qemu_opt_has_help_opt(opts)) {
> -        return 0;
> -    }
> -    cpu_type = cpu_type_by_name(cpu_model);
> -    list_cpu_props((CPUState *)object_new(cpu_type));
> -    return 1;
> -}
> -
>   static int device_help_func(void *opaque, QemuOpts *opts, Error **errp)
>   {
>       return qdev_device_help(opts);
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index edcd34e62b..e4318fcc46 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -2229,15 +2229,17 @@ void riscv_cpu_list(void)
>   void riscv_cpu_list_props(CPUState *cs)
>   {
>       char *enabled_isa;
> -    RISCVCPU *cpu = RISCV_CPU(cs);
> -    RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(cpu);
> -    ObjectClass *oc = OBJECT_CLASS(mcc);
>   
>       enabled_isa = riscv_isa_string(RISCV_CPU(cs));
>       qemu_printf("Enabled extensions:\n");
>       qemu_printf("\t%s\n", enabled_isa);
> +#ifndef CONFIG_USER_ONLY
> +    RISCVCPU *cpu = RISCV_CPU(cs);
> +    RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(cpu);
> +    ObjectClass *oc = OBJECT_CLASS(mcc);
>       qemu_printf("To get all configuable options for this cpu, use"
>                   " -device %s,help\n", object_class_get_name(oc));
> +#endif
>   }
>   
>   #define DEFINE_CPU(type_name, initfn)      \