mirror of https://github.com/proxmox/mirror_qemu
ppc/kvm: Do not mess up the generic CPU family registration
The code for registering the sPAPR CPU host core type has been added inbetween the generic CPU host core type and the generic CPU family type. That way the instance_init and the class_init information got lost when registering the generic CPU family type. Fix it by moving the generic family registration before the spapr cpu core registration code. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>master
parent
4babfaf05d
commit
9c83fc2e8e
|
@ -2394,6 +2394,13 @@ static int kvm_ppc_register_host_cpu_type(void)
|
||||||
type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc));
|
type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc));
|
||||||
type_register(&type_info);
|
type_register(&type_info);
|
||||||
|
|
||||||
|
/* Register generic family CPU class for a family */
|
||||||
|
pvr_pcc = ppc_cpu_get_family_class(pvr_pcc);
|
||||||
|
dc = DEVICE_CLASS(pvr_pcc);
|
||||||
|
type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc));
|
||||||
|
type_info.name = g_strdup_printf("%s-"TYPE_POWERPC_CPU, dc->desc);
|
||||||
|
type_register(&type_info);
|
||||||
|
|
||||||
#if defined(TARGET_PPC64)
|
#if defined(TARGET_PPC64)
|
||||||
type_info.name = g_strdup_printf("%s-"TYPE_SPAPR_CPU_CORE, "host");
|
type_info.name = g_strdup_printf("%s-"TYPE_SPAPR_CPU_CORE, "host");
|
||||||
type_info.parent = TYPE_SPAPR_CPU_CORE,
|
type_info.parent = TYPE_SPAPR_CPU_CORE,
|
||||||
|
@ -2406,13 +2413,6 @@ static int kvm_ppc_register_host_cpu_type(void)
|
||||||
type_info.instance_init = NULL;
|
type_info.instance_init = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Register generic family CPU class for a family */
|
|
||||||
pvr_pcc = ppc_cpu_get_family_class(pvr_pcc);
|
|
||||||
dc = DEVICE_CLASS(pvr_pcc);
|
|
||||||
type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc));
|
|
||||||
type_info.name = g_strdup_printf("%s-"TYPE_POWERPC_CPU, dc->desc);
|
|
||||||
type_register(&type_info);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue