[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 15/20] target/riscv/cpu.c: add satp_mode properties earlier
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v6 15/20] target/riscv/cpu.c: add satp_mode properties earlier |
Date: |
Wed, 28 Jun 2023 18:30:28 -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>
---
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 5428402cfa..b4a6fd8bab 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1743,6 +1743,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);
}
@@ -1761,10 +1763,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 v6 09/20] linux-headers: Update to v6.4-rc1, (continued)
- [PATCH v6 09/20] linux-headers: Update to v6.4-rc1, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 10/20] target/riscv/kvm.c: init 'misa_ext_mask' with scratch CPU, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 11/20] target/riscv/cpu: add misa_ext_info_arr[], Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 12/20] target/riscv: add KVM specific MISA properties, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 13/20] target/riscv/kvm.c: update KVM MISA bits, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 14/20] target/riscv/kvm.c: add multi-letter extension KVM properties, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 15/20] target/riscv/cpu.c: add satp_mode properties earlier,
Daniel Henrique Barboza <=
- [PATCH v6 16/20] target/riscv/cpu.c: remove priv_ver check from riscv_isa_string_ext(), Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 17/20] target/riscv/cpu.c: create KVM mock properties, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 19/20] target/riscv/kvm.c: add kvmconfig_get_cfg_addr() helper, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 18/20] target/riscv: update multi-letter extension KVM properties, Daniel Henrique Barboza, 2023/06/28
- [PATCH v6 20/20] target/riscv/kvm.c: read/write (cbom|cboz)_blocksize in KVM, Daniel Henrique Barboza, 2023/06/28