Received: from eggs.gnu.org ([208.118.235.92]:48648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3af-0000Cm-Eg for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a8-0000dG-Cq for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:29 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:07:04 +0100 Message-Id: <1362773228-1747-63-git-send-email-agraf@suse.de> In-Reply-To: <1362773228-1747-1-git-send-email-agraf@suse.de> References: <1362773228-1747-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 62/66] target-ppc: Make host CPU a subclass of the host's CPU model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel qemu-devel Cc: Blue Swirl , "qemu-ppc@nongnu.org list:PowerPC" , =?utf-8?q?Andreas=20F=C3=A4rber?= , =?utf-8?q?Aur=C3=A9lien=20Jarno?= From: Andreas F=C3=A4rber This avoids assigning individual class fields and contributors forgetting to add field assignments in KVM-only code. ppc_cpu_class_find_by_pvr() requires the CPU model classes to be registered, so defer host CPU type registration to kvm_arch_init(). Only register the host CPU type if there is a class with matching PVR. This lets us drop error handling from instance_init. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- target-ppc/kvm.c | 66 +++++++++++++++----------------------= ------ target-ppc/translate_init.c | 15 +++++---- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 4451159..9dff760 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -81,6 +81,8 @@ static void kvm_kick_cpu(void *opaque) qemu_cpu_kick(CPU(cpu)); } =20 +static int kvm_ppc_register_host_cpu_type(void); + int kvm_arch_init(KVMState *s) { cap_interrupt_unset =3D kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ= ); @@ -98,6 +100,8 @@ int kvm_arch_init(KVMState *s) "VM to stall at times!\n"); } =20 + kvm_ppc_register_host_cpu_type(); + return 0; } =20 @@ -1488,44 +1492,15 @@ static void alter_insns(uint64_t *word, uint64_t = flags, bool on) =20 static void kvmppc_host_cpu_initfn(Object *obj) { - PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(obj); - assert(kvm_enabled()); - - if (pcc->pvr !=3D mfpvr()) { - fprintf(stderr, "Your host CPU is unsupported.\n" - "Please choose a supported model instead, see -cpu ?.\n"= ); - exit(1); - } } =20 static void kvmppc_host_cpu_class_init(ObjectClass *oc, void *data) { PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - uint32_t host_pvr =3D mfpvr(); - PowerPCCPUClass *pvr_pcc; uint32_t vmx =3D kvmppc_get_vmx(); uint32_t dfp =3D kvmppc_get_dfp(); =20 - pvr_pcc =3D ppc_cpu_class_by_pvr(host_pvr); - if (pvr_pcc !=3D NULL) { - pcc->pvr =3D pvr_pcc->pvr; - pcc->svr =3D pvr_pcc->svr; - pcc->insns_flags =3D pvr_pcc->insns_flags; - pcc->insns_flags2 =3D pvr_pcc->insns_flags2; - pcc->msr_mask =3D pvr_pcc->msr_mask; - pcc->mmu_model =3D pvr_pcc->mmu_model; - pcc->excp_model =3D pvr_pcc->excp_model; - pcc->bus_model =3D pvr_pcc->bus_model; - pcc->flags =3D pvr_pcc->flags; - pcc->bfd_mach =3D pvr_pcc->bfd_mach; -#ifdef TARGET_PPC64 - pcc->sps =3D pvr_pcc->sps; -#endif - pcc->init_proc =3D pvr_pcc->init_proc; - pcc->check_pow =3D pvr_pcc->check_pow; - } - /* Now fix up the class with information we can query from the host = */ =20 if (vmx !=3D -1) { @@ -1552,6 +1527,25 @@ int kvmppc_fixup_cpu(PowerPCCPU *cpu) return 0; } =20 +static int kvm_ppc_register_host_cpu_type(void) +{ + TypeInfo type_info =3D { + .name =3D TYPE_HOST_POWERPC_CPU, + .instance_init =3D kvmppc_host_cpu_initfn, + .class_init =3D kvmppc_host_cpu_class_init, + }; + uint32_t host_pvr =3D mfpvr(); + PowerPCCPUClass *pvr_pcc; + + pvr_pcc =3D ppc_cpu_class_by_pvr(host_pvr); + if (pvr_pcc =3D=3D NULL) { + return -1; + } + type_info.parent =3D object_class_get_name(OBJECT_CLASS(pvr_pcc)); + type_register(&type_info); + return 0; +} + =20 bool kvm_arch_stop_on_emulation_error(CPUState *cpu) { @@ -1567,17 +1561,3 @@ int kvm_arch_on_sigbus(int code, void *addr) { return 1; } - -static const TypeInfo kvm_host_cpu_type_info =3D { - .name =3D TYPE_HOST_POWERPC_CPU, - .parent =3D TYPE_POWERPC_CPU, - .instance_init =3D kvmppc_host_cpu_initfn, - .class_init =3D kvmppc_host_cpu_class_init, -}; - -static void kvm_ppc_register_types(void) -{ - type_register_static(&kvm_host_cpu_type_info); -} - -type_init(kvm_ppc_register_types) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 1783c22..521cdcc 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8298,13 +8298,6 @@ static ObjectClass *ppc_cpu_class_by_name(const ch= ar *name) const char *p; int i, len; =20 - if (strcasecmp(name, "host") =3D=3D 0) { - if (kvm_enabled()) { - ret =3D object_class_by_name(TYPE_HOST_POWERPC_CPU); - } - return ret; - } - /* Check if the given name is a PVR */ len =3D strlen(name); if (len =3D=3D 10 && name[0] =3D=3D '0' && name[1] =3D=3D 'x') { @@ -8405,6 +8398,9 @@ static void ppc_cpu_list_entry(gpointer data, gpoin= ter user_data) return; } #endif + if (unlikely(strcmp(typename, TYPE_HOST_POWERPC_CPU) =3D=3D 0)) { + return; + } =20 name =3D g_strndup(typename, strlen(typename) - strlen("-" TYPE_POWERPC_CPU)); @@ -8427,6 +8423,11 @@ void ppc_cpu_list(FILE *f, fprintf_function cpu_fp= rintf) g_slist_foreach(list, ppc_cpu_list_entry, &s); g_slist_free(list); =20 +#ifdef CONFIG_KVM + cpu_fprintf(f, "\n"); + cpu_fprintf(f, "PowerPC %-16s\n", "host"); +#endif + cpu_fprintf(f, "\n"); for (i =3D 0; i < ARRAY_SIZE(ppc_cpu_aliases); i++) { ObjectClass *oc =3D ppc_cpu_class_by_name(ppc_cpu_aliases[i].mod= el); --=20 1.6.0.2