Commit 9c83fc2e authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

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: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 4babfaf0

target-ppc/kvm.c

+7 −7
Original line number Diff line number Diff line
@@ -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_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)

    type_info.name = g_strdup_printf("%s-"TYPE_SPAPR_CPU_CORE, "host");

    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;

#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;

}