Skip to content

Commit

Permalink
target/riscv/cpu.c: add satp_mode properties earlier
Browse files Browse the repository at this point in the history
riscv_cpu_add_user_properties() ended up with an excess of "#ifndef
CONFIG_USER_ONLY" blocks after changes that added KVM properties
handling.

KVM specific properties are required to be created earlier than their
TCG counterparts, but the remaining props can be created at any order.
Move riscv_add_satp_mode_properties() to the start of the function,
inside the !CONFIG_USER_ONLY block already present there, to remove the
last ifndef block.

Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20230706101738.460804-16-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  • Loading branch information
danielhb authored and alistair23 committed Jul 10, 2023
1 parent f7a69fa commit b71f9dc
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions target/riscv/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1852,6 +1852,8 @@ static void riscv_cpu_add_user_properties(Object *obj)
DeviceState *dev = DEVICE(obj);

#ifndef CONFIG_USER_ONLY
riscv_add_satp_mode_properties(obj);

if (kvm_enabled()) {
kvm_riscv_init_user_properties(obj);
}
Expand All @@ -1870,10 +1872,6 @@ static void riscv_cpu_add_user_properties(Object *obj)
#endif
qdev_property_add_static(dev, prop);
}

#ifndef CONFIG_USER_ONLY
riscv_add_satp_mode_properties(obj);
#endif
}

static Property riscv_cpu_properties[] = {
Expand Down

0 comments on commit b71f9dc

Please sign in to comment.