From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef4MB-0003B1-Dz for qemu-devel@nongnu.org; Fri, 26 Jan 2018 08:47:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef4M8-0005cJ-9T for qemu-devel@nongnu.org; Fri, 26 Jan 2018 08:47:51 -0500 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= References: <1512670493-18114-1-git-send-email-peter.maydell@linaro.org> <1512670493-18114-4-git-send-email-peter.maydell@linaro.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <6f0c5a48-561d-6bc6-1c05-1b773fbba65a@amsat.org> Date: Fri, 26 Jan 2018 10:47:43 -0300 MIME-Version: 1.0 In-Reply-To: <1512670493-18114-4-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 3/6] target/arm: Move definition of 'host' cpu type into cpu.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, "Richard W . M . Jones" , Eduardo Habkost , patches@linaro.org 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 Reviewed-by: Philippe Mathieu-Daudé > --- > 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; > } > >