[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 15/20] target/riscv/cpu.c: add satp_mode properties earlier
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v8 15/20] target/riscv/cpu.c: add satp_mode properties earlier |
Date: |
Wed, 5 Jul 2023 18:39:50 -0300 |
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>
---
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
- [PATCH v8 07/20] target/riscv: read marchid/mimpid in kvm_riscv_init_machine_ids(), (continued)
- [PATCH v8 07/20] target/riscv: read marchid/mimpid in kvm_riscv_init_machine_ids(), Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 08/20] target/riscv: handle mvendorid/marchid/mimpid for KVM CPUs, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 09/20] linux-headers: Update to v6.4-rc1, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 10/20] target/riscv/kvm.c: init 'misa_ext_mask' with scratch CPU, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 11/20] target/riscv/cpu: add misa_ext_info_arr[], Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 12/20] target/riscv: add KVM specific MISA properties, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 13/20] target/riscv/kvm.c: update KVM MISA bits, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 14/20] target/riscv/kvm.c: add multi-letter extension KVM properties, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 15/20] target/riscv/cpu.c: add satp_mode properties earlier,
Daniel Henrique Barboza <=
- [PATCH v8 16/20] target/riscv/cpu.c: remove priv_ver check from riscv_isa_string_ext(), Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 17/20] target/riscv/cpu.c: create KVM mock properties, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 18/20] target/riscv: update multi-letter extension KVM properties, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 19/20] target/riscv/kvm.c: add kvmconfig_get_cfg_addr() helper, Daniel Henrique Barboza, 2023/07/05
- [PATCH v8 20/20] target/riscv/kvm.c: read/write (cbom|cboz)_blocksize in KVM, Daniel Henrique Barboza, 2023/07/05