First, the "kvm-no-adjvtime" and "kvm-steal-time" are only
available when KVM is available, so guard this block within
a 'kvm_enabled()' check. Since the "kvm-steal-time" property
is always available under KVM, directly set it.
Then, the "kvm-no-adjvtime" property is added to ARMCPU when
the ARM_FEATURE_GENERIC_TIMER feature is available. Rather than
checking whether the QOM property is present, directly check
the feature.
Finally, since we are sure the properties are available, we can
use &error_abort instead of NULL error. Replace:
object_property_set_bool(..., PROPERTY, ..., &error_abort);
by:
qdev_prop_set_bit(..., PROPERTY, ...);
which is a one-to-one replacement.
Suggested-by: Markus Armbruster <arm...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
hw/arm/virt.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 2ce4a18d73..6ac8fb19d2 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2150,14 +2150,13 @@ static void machvirt_init(MachineState *machine)
object_property_set_bool(cpuobj, "has_el2", false, NULL);
}
- if (vmc->kvm_no_adjvtime &&
- object_property_find(cpuobj, "kvm-no-adjvtime")) {
- object_property_set_bool(cpuobj, "kvm-no-adjvtime", true, NULL);
- }
-
- if (vmc->no_kvm_steal_time &&
- object_property_find(cpuobj, "kvm-steal-time")) {
- object_property_set_bool(cpuobj, "kvm-steal-time", false, NULL);
+ if (kvm_enabled()) {
+ if (arm_feature(cpu_env(cs), ARM_FEATURE_GENERIC_TIMER)) {
+ qdev_prop_set_bit(DEVICE(cs), "kvm-no-adjvtime",
+ vmc->kvm_no_adjvtime);
+ }
+ qdev_prop_set_bit(DEVICE(cs), "kvm-steal-time",
+ !vmc->no_kvm_steal_time);
}
if (arm_feature(cpu_env(cs), ARM_FEATURE_PMU) && vmc->no_pmu) {
--
2.41.0
