Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
target/riscv/cpu.c: add riscv_cpu_add_kvm_unavail_prop_array()
Use a helper in riscv_cpu_add_kvm_properties() to eliminate some of its
code repetition.

Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230901194627.1214811-9-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  • Loading branch information
danielhb authored and alistair23 committed Sep 8, 2023
1 parent 4bbe8c9 commit 57fdd04
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions target/riscv/cpu.c
Expand Up @@ -1978,6 +1978,16 @@ static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name)
NULL, (void *)prop_name);
}

static void riscv_cpu_add_kvm_unavail_prop_array(Object *obj,
Property *array)
{
g_assert(array);

for (Property *prop = array; prop && prop->name; prop++) {
riscv_cpu_add_kvm_unavail_prop(obj, prop->name);
}
}

static void riscv_cpu_add_kvm_properties(Object *obj)
{
Property *prop;
Expand All @@ -1986,17 +1996,9 @@ static void riscv_cpu_add_kvm_properties(Object *obj)
kvm_riscv_init_user_properties(obj);
riscv_cpu_add_misa_properties(obj);

for (prop = riscv_cpu_extensions; prop && prop->name; prop++) {
riscv_cpu_add_kvm_unavail_prop(obj, prop->name);
}

for (prop = riscv_cpu_vendor_exts; prop && prop->name; prop++) {
riscv_cpu_add_kvm_unavail_prop(obj, prop->name);
}

for (prop = riscv_cpu_experimental_exts; prop && prop->name; prop++) {
riscv_cpu_add_kvm_unavail_prop(obj, prop->name);
}
riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions);
riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_vendor_exts);
riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_experimental_exts);

for (prop = riscv_cpu_options; prop && prop->name; prop++) {
/* Check if KVM created the property already */
Expand Down

0 comments on commit 57fdd04

Please sign in to comment.