[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/14] hw/arm: Prefer arm_feature(M_SECURITY) over object_prop
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 05/14] hw/arm: Prefer arm_feature(M_SECURITY) over object_property_find() |
Date: |
Wed, 10 Jan 2024 20:53:19 +0100 |
Both "idau" and "init-svtor" properties are added to ARMCPU
when the ARM_FEATURE_M_SECURITY feature is available. Rather
than checking whether the QOM properties are present, directly
check the feature.
Since we are sure the "init-svtor" is present, the
object_property_set_uint() can't fail.
Instead of using &error_abort, replace:
object_property_set_uint(OBJECT(s->cpu), "init-svtor",
s->init_svtor, &error_abort);
by:
qdev_prop_set_uint32(cpudev, "init-svtor", s->init_svtor);
which is a one-to-one replacement.
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/armv7m.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 530729f42e..8350267d96 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -311,16 +311,11 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
qdev_prop_set_bit(cpudev, "start-powered-off", s->start_powered_off);
qdev_prop_set_uint32(cpudev, "init-nsvtor", s->init_nsvtor);
- if (object_property_find(OBJECT(s->cpu), "idau")) {
+ if (arm_feature(&s->cpu->env, ARM_FEATURE_M_SECURITY)) {
+ qdev_prop_set_uint32(cpudev, "init-svtor", s->init_svtor);
object_property_set_link(OBJECT(s->cpu), "idau", s->idau,
&error_abort);
}
- if (object_property_find(OBJECT(s->cpu), "init-svtor")) {
- if (!object_property_set_uint(OBJECT(s->cpu), "init-svtor",
- s->init_svtor, errp)) {
- return;
- }
- }
if (object_property_find(OBJECT(s->cpu), "vfp")) {
if (!object_property_set_bool(OBJECT(s->cpu), "vfp", s->vfp, errp)) {
return;
--
2.41.0
- [PATCH v3 00/14] hw/arm: Prefer arm_feature() over object_property_find(), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 01/14] hw/arm/armv7m: Introduce cpudev variable in armv7m_realize(), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 02/14] hw/arm/armv7m: Ensure requested CPU type implements ARM_FEATURE_M, Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 03/14] hw/arm/armv7m: Move code setting 'start-powered-off' property around, Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 04/14] hw/arm/armv7m: Always set 'init-nsvtor' property for Cortex-M CPUs, Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 05/14] hw/arm: Prefer arm_feature(M_SECURITY) over object_property_find(),
Philippe Mathieu-Daudé <=
- [PATCH v3 06/14] hw/arm: Prefer arm_feature(THUMB_DSP) over object_property_find(dsp), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 07/14] hw/arm: Prefer arm_feature(V7) over object_property_find(pmsav7-dregion), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 08/14] hw/arm: Prefer arm_feature(EL3) over object_property_find(has_el3), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 09/14] hw/arm: Prefer arm_feature(EL2) over object_property_find(has_el2), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 10/14] hw/arm: Prefer arm_feature(CBAR*) over object_property_find(reset-cbar), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 11/14] hw/arm: Prefer arm_feature(PMU) over object_property_find(pmu), Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 12/14] hw/arm: Prefer arm_feature(GENERIC_TMR) over 'kvm-no-adjvtime' property, Philippe Mathieu-Daudé, 2024/01/10
- [PATCH v3 13/14] hw/arm: Prefer arm_feature(AARCH64) over object_property_find(aarch64), Philippe Mathieu-Daudé, 2024/01/10