@@ -778,10 +778,6 @@ void arm_cpu_post_init(Object *obj)
qdev_property_add_static(DEVICE(cpu), &arm_cpu_gt_cntfrq_property);
}
- if (kvm_enabled()) {
- kvm_arm_add_vcpu_properties(obj);
- }
-
#ifndef CONFIG_USER_ONLY
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) &&
cpu_isar_feature(aa64_mte, cpu)) {
@@ -63,6 +63,7 @@ static void kvm_cpu_instance_init(CPUState *cs)
* the same interface as non-KVM CPUs.
*/
qdev_init_gpio_in(DEVICE(cs), arm_cpu_kvm_set_irq, 4);
+ kvm_arm_add_vcpu_properties(OBJECT(cs));
}
static bool kvm_cpu_realizefn(CPUState *cs, Error **errp)