Message ID | 20210317183013.25772-39-cfontana@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm cleanup experiment for kvm-only build | expand |
On 3/17/21 7:30 PM, Claudio Fontana wrote: > Signed-off-by: Claudio Fontana <cfontana@suse.de> > --- > target/arm/cpu.c | 4 ---- > target/arm/kvm/kvm-cpu.c | 1 + > 2 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/target/arm/cpu.c b/target/arm/cpu.c > index 3d6501c2c5..ac01fa0bae 100644 > --- a/target/arm/cpu.c > +++ b/target/arm/cpu.c > @@ -786,10 +786,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)) { > diff --git a/target/arm/kvm/kvm-cpu.c b/target/arm/kvm/kvm-cpu.c > index b3e97080cc..3b8a8de30f 100644 > --- a/target/arm/kvm/kvm-cpu.c > +++ b/target/arm/kvm/kvm-cpu.c > @@ -89,6 +89,7 @@ static void host_cpu_instance_init(Object *obj) > if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { > aarch64_add_sve_properties(obj); > } > + kvm_arm_add_vcpu_properties(obj); > arm_cpu_post_init(obj); > } > > This is wrong, the arm_cpu_post_init stuff confused me. Dropped.
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 3d6501c2c5..ac01fa0bae 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -786,10 +786,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)) { diff --git a/target/arm/kvm/kvm-cpu.c b/target/arm/kvm/kvm-cpu.c index b3e97080cc..3b8a8de30f 100644 --- a/target/arm/kvm/kvm-cpu.c +++ b/target/arm/kvm/kvm-cpu.c @@ -89,6 +89,7 @@ static void host_cpu_instance_init(Object *obj) if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { aarch64_add_sve_properties(obj); } + kvm_arm_add_vcpu_properties(obj); arm_cpu_post_init(obj); }
Signed-off-by: Claudio Fontana <cfontana@suse.de> --- target/arm/cpu.c | 4 ---- target/arm/kvm/kvm-cpu.c | 1 + 2 files changed, 1 insertion(+), 4 deletions(-)