From: Andrew Jones <ajones@ventanamicro.com>
To: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
alistair.francis@wdc.com, bmeng@tinylab.org,
liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com,
palmer@rivosinc.com
Subject: Re: [PATCH RESEND v8 07/20] target/riscv/cpu.c: add riscv_cpu_add_qdev_prop_array()
Date: Thu, 31 Aug 2023 15:01:44 +0200 [thread overview]
Message-ID: <20230831-bf8480410d43227a4308903e@orel> (raw)
In-Reply-To: <20230824221440.484675-8-dbarboza@ventanamicro.com>
On Thu, Aug 24, 2023 at 07:14:27PM -0300, Daniel Henrique Barboza wrote:
> The code inside riscv_cpu_add_user_properties() became quite repetitive
> after recent changes. Add a helper to hide the repetition away.
>
> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> ---
> target/riscv/cpu.c | 27 +++++++++++----------------
> 1 file changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 668522db01..4608fa2378 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1946,6 +1946,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v,
> }
> #endif
>
> +static void riscv_cpu_add_qdev_prop_array(DeviceState *dev, Property *array)
> +{
> + for (Property *prop = array; prop && prop->name; prop++) {
Here checking prop first is a good idea, as a caller could pass NULL for
'array'. But, if we don't want callers to ever pass NULL for array, then
dropping the prop check will ensure we get a segfault to spot the bug (or,
a bit cleaner, we could add an explicit assert(array)).
> + qdev_property_add_static(dev, prop);
> + }
> +}
> +
> #ifndef CONFIG_USER_ONLY
> static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name)
> {
> @@ -2002,7 +2009,6 @@ static void riscv_cpu_add_kvm_properties(Object *obj)
> */
> static void riscv_cpu_add_user_properties(Object *obj)
> {
> - Property *prop;
> DeviceState *dev = DEVICE(obj);
>
> #ifndef CONFIG_USER_ONLY
> @@ -2016,21 +2022,10 @@ static void riscv_cpu_add_user_properties(Object *obj)
>
> riscv_cpu_add_misa_properties(obj);
>
> - for (prop = riscv_cpu_extensions; prop && prop->name; prop++) {
> - qdev_property_add_static(dev, prop);
> - }
> -
> - for (prop = riscv_cpu_options; prop && prop->name; prop++) {
> - qdev_property_add_static(dev, prop);
> - }
> -
> - for (prop = riscv_cpu_vendor_exts; prop && prop->name; prop++) {
> - qdev_property_add_static(dev, prop);
> - }
> -
> - for (prop = riscv_cpu_experimental_exts; prop && prop->name; prop++) {
> - qdev_property_add_static(dev, prop);
> - }
> + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_extensions);
> + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_options);
> + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_vendor_exts);
> + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_experimental_exts);
> }
>
> static Property riscv_cpu_properties[] = {
> --
> 2.41.0
>
>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
next prev parent reply other threads:[~2023-08-31 13:17 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 22:14 [PATCH RESEND v8 00/20] riscv: 'max' CPU, detect user choice in TCG Daniel Henrique Barboza
2023-08-24 22:14 ` [PATCH RESEND v8 01/20] target/riscv/cpu.c: split CPU options from riscv_cpu_extensions[] Daniel Henrique Barboza
2023-08-31 12:49 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 02/20] target/riscv/cpu.c: skip 'bool' check when filtering KVM props Daniel Henrique Barboza
2023-08-31 12:49 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 03/20] target/riscv/cpu.c: split kvm prop handling to its own helper Daniel Henrique Barboza
2023-08-31 12:51 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 04/20] target/riscv: add DEFINE_PROP_END_OF_LIST() to riscv_cpu_options[] Daniel Henrique Barboza
2023-08-31 12:54 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 05/20] target/riscv/cpu.c: split non-ratified exts from riscv_cpu_extensions[] Daniel Henrique Barboza
2023-08-31 12:56 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 06/20] target/riscv/cpu.c: split vendor " Daniel Henrique Barboza
2023-08-31 12:57 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 07/20] target/riscv/cpu.c: add riscv_cpu_add_qdev_prop_array() Daniel Henrique Barboza
2023-08-31 13:01 ` Andrew Jones [this message]
2023-08-24 22:14 ` [PATCH RESEND v8 08/20] target/riscv/cpu.c: add riscv_cpu_add_kvm_unavail_prop_array() Daniel Henrique Barboza
2023-08-31 13:03 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 09/20] target/riscv/cpu.c: limit cfg->vext_spec log message Daniel Henrique Barboza
2023-08-24 22:14 ` [PATCH RESEND v8 10/20] target/riscv: add 'max' CPU type Daniel Henrique Barboza
2023-08-31 13:11 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 11/20] avocado, risc-v: add opensbi tests for 'max' CPU Daniel Henrique Barboza
2023-08-31 13:16 ` Andrew Jones
2023-08-31 14:20 ` Daniel Henrique Barboza
2023-08-24 22:14 ` [PATCH RESEND v8 12/20] target/riscv: deprecate the 'any' CPU type Daniel Henrique Barboza
2023-08-31 13:19 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 13/20] target/riscv/cpu.c: use offset in isa_ext_is_enabled/update_enabled Daniel Henrique Barboza
2023-08-31 13:20 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 14/20] target/riscv: make CPUCFG() macro public Daniel Henrique Barboza
2023-08-31 13:22 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 15/20] target/riscv/cpu.c: introduce cpu_cfg_ext_auto_update() Daniel Henrique Barboza
2023-08-31 13:33 ` Andrew Jones
2023-08-31 14:12 ` Daniel Henrique Barboza
2023-08-24 22:14 ` [PATCH RESEND v8 16/20] target/riscv/cpu.c: use cpu_cfg_ext_auto_update() during realize() Daniel Henrique Barboza
2023-08-31 13:37 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 17/20] target/riscv/cpu.c: introduce RISCVCPUMultiExtConfig Daniel Henrique Barboza
2023-08-31 13:43 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 18/20] target/riscv: use isa_ext_update_enabled() in init_max_cpu_extensions() Daniel Henrique Barboza
2023-08-31 13:56 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 19/20] target/riscv/cpu.c: honor user choice in cpu_cfg_ext_auto_update() Daniel Henrique Barboza
2023-08-31 13:58 ` Andrew Jones
2023-08-24 22:14 ` [PATCH RESEND v8 20/20] target/riscv/cpu.c: consider user option with RVG Daniel Henrique Barboza
2023-08-31 14:02 ` Andrew Jones
2023-08-31 15:43 ` Daniel Henrique Barboza
2023-08-31 14:05 ` [PATCH RESEND v8 00/20] riscv: 'max' CPU, detect user choice in TCG Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831-bf8480410d43227a4308903e@orel \
--to=ajones@ventanamicro.com \
--cc=alistair.francis@wdc.com \
--cc=bmeng@tinylab.org \
--cc=dbarboza@ventanamicro.com \
--cc=liweiwei@iscas.ac.cn \
--cc=palmer@rivosinc.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).