| Message ID | 1512670493-18114-4-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: support -cpu max (and gic-version=max) | expand |
On 12/07/2017 03:14 PM, Peter Maydell wrote: > Move the definition of the 'host' cpu type into cpu.c, where all the > other CPU types are defined. We can do this now we've decoupled it > from the KVM-specific host feature probing. This means we now create > the type unconditionally (assuming we were built with KVM support at > all), but if you try to use it without -enable-kvm this will end > up in the "host cpu probe failed and KVM not enabled" path in > arm_cpu_realizefn(), for an appropriate error message. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > target/arm/cpu.c | 24 ++++++++++++++++++++++++ > target/arm/kvm.c | 19 ------------------- > 2 files changed, 24 insertions(+), 19 deletions(-) > > diff --git a/target/arm/cpu.c b/target/arm/cpu.c > index a7deb10..9304277 100644 > --- a/target/arm/cpu.c > +++ b/target/arm/cpu.c > @@ -1785,6 +1785,26 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) > #endif > } > > +#ifdef CONFIG_KVM > +static void arm_host_initfn(Object *obj) > +{ > + ARMCPU *cpu = ARM_CPU(obj); > + > + kvm_arm_set_cpu_features_from_host(cpu); > +} > + > +static const TypeInfo host_arm_cpu_type_info = { > + .name = TYPE_ARM_HOST_CPU, > +#ifdef TARGET_AARCH64 > + .parent = TYPE_AARCH64_CPU, > +#else > + .parent = TYPE_ARM_CPU, > +#endif > + .instance_init = arm_host_initfn, > +}; > + > +#endif > + > static void cpu_register(const ARMCPUInfo *info) > { > TypeInfo type_info = { > @@ -1822,6 +1842,10 @@ static void arm_cpu_register_types(void) > cpu_register(info); > info++; > } > + > +#ifdef CONFIG_KVM > + type_register_static(&host_arm_cpu_type_info); > +#endif > } > > type_init(arm_cpu_register_types) > diff --git a/target/arm/kvm.c b/target/arm/kvm.c > index 945696c..6bdc027 100644 > --- a/target/arm/kvm.c > +++ b/target/arm/kvm.c > @@ -152,23 +152,6 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) > env->features = arm_host_cpu_features.features; > } > > -static void kvm_arm_host_cpu_initfn(Object *obj) > -{ > - ARMCPU *cpu = ARM_CPU(obj); > - > - kvm_arm_set_cpu_features_from_host(cpu); > -} > - > -static const TypeInfo host_arm_cpu_type_info = { > - .name = TYPE_ARM_HOST_CPU, > -#ifdef TARGET_AARCH64 > - .parent = TYPE_AARCH64_CPU, > -#else > - .parent = TYPE_ARM_CPU, > -#endif > - .instance_init = kvm_arm_host_cpu_initfn, > -}; > - > int kvm_arch_init(MachineState *ms, KVMState *s) > { > /* For ARM interrupt delivery is always asynchronous, > @@ -184,8 +167,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s) > > cap_has_mp_state = kvm_check_extension(s, KVM_CAP_MP_STATE); > > - type_register_static(&host_arm_cpu_type_info); > - > return 0; > } > >
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index a7deb10..9304277 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1785,6 +1785,26 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) #endif } +#ifdef CONFIG_KVM +static void arm_host_initfn(Object *obj) +{ + ARMCPU *cpu = ARM_CPU(obj); + + kvm_arm_set_cpu_features_from_host(cpu); +} + +static const TypeInfo host_arm_cpu_type_info = { + .name = TYPE_ARM_HOST_CPU, +#ifdef TARGET_AARCH64 + .parent = TYPE_AARCH64_CPU, +#else + .parent = TYPE_ARM_CPU, +#endif + .instance_init = arm_host_initfn, +}; + +#endif + static void cpu_register(const ARMCPUInfo *info) { TypeInfo type_info = { @@ -1822,6 +1842,10 @@ static void arm_cpu_register_types(void) cpu_register(info); info++; } + +#ifdef CONFIG_KVM + type_register_static(&host_arm_cpu_type_info); +#endif } type_init(arm_cpu_register_types) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 945696c..6bdc027 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -152,23 +152,6 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) env->features = arm_host_cpu_features.features; } -static void kvm_arm_host_cpu_initfn(Object *obj) -{ - ARMCPU *cpu = ARM_CPU(obj); - - kvm_arm_set_cpu_features_from_host(cpu); -} - -static const TypeInfo host_arm_cpu_type_info = { - .name = TYPE_ARM_HOST_CPU, -#ifdef TARGET_AARCH64 - .parent = TYPE_AARCH64_CPU, -#else - .parent = TYPE_ARM_CPU, -#endif - .instance_init = kvm_arm_host_cpu_initfn, -}; - int kvm_arch_init(MachineState *ms, KVMState *s) { /* For ARM interrupt delivery is always asynchronous, @@ -184,8 +167,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_has_mp_state = kvm_check_extension(s, KVM_CAP_MP_STATE); - type_register_static(&host_arm_cpu_type_info); - return 0; }
Move the definition of the 'host' cpu type into cpu.c, where all the other CPU types are defined. We can do this now we've decoupled it from the KVM-specific host feature probing. This means we now create the type unconditionally (assuming we were built with KVM support at all), but if you try to use it without -enable-kvm this will end up in the "host cpu probe failed and KVM not enabled" path in arm_cpu_realizefn(), for an appropriate error message. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target/arm/cpu.c | 24 ++++++++++++++++++++++++ target/arm/kvm.c | 19 ------------------- 2 files changed, 24 insertions(+), 19 deletions(-) -- 2.7.4