Message ID | 20230706101738.460804-16-dbarboza@ventanamicro.com |
---|---|
State | New |
Headers | show |
Series | target/riscv, KVM: fixes and enhancements | expand |
On Thu, Jul 6, 2023 at 8:20 PM Daniel Henrique Barboza <dbarboza@ventanamicro.com> wrote: > > 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> Alistair > --- > target/riscv/cpu.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 31e591a938..deb3c0f035 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -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); > } > @@ -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[] = { > -- > 2.41.0 > >
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 31e591a938..deb3c0f035 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -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); } @@ -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[] = {