[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 4/5] ppc/kvm: Do not mess up the generic CPU family re
From: |
Thomas Huth |
Subject: |
[Qemu-ppc] [PATCH 4/5] ppc/kvm: Do not mess up the generic CPU family registration |
Date: |
Tue, 9 Aug 2016 11:17:08 +0200 |
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 <address@hidden>
---
target-ppc/kvm.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 84764ed..82b1df9 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -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;
}
--
1.8.3.1
- [Qemu-ppc] [PATCH for-2.7 0/5] spapr: Fix regression in CPU alias handling, Thomas Huth, 2016/08/09
- [Qemu-ppc] [PATCH 1/5] ppc: Introduce a function to look up CPU alias strings, Thomas Huth, 2016/08/09
- [Qemu-ppc] [PATCH 2/5] hw/ppc/spapr: Look up CPU alias names instead of hard-coding the aliases, Thomas Huth, 2016/08/09
- [Qemu-ppc] [PATCH 3/5] hw/ppc/spapr: Do not leak the memory of the type string, Thomas Huth, 2016/08/09
- [Qemu-ppc] [PATCH 4/5] ppc/kvm: Do not mess up the generic CPU family registration,
Thomas Huth <=
- [Qemu-ppc] [PATCH 5/5] ppc/kvm: Register also a generic spapr CPU core family type, Thomas Huth, 2016/08/09
- Re: [Qemu-ppc] [PATCH for-2.7 0/5] spapr: Fix regression in CPU alias handling, Andrea Bolognani, 2016/08/09
- Re: [Qemu-ppc] [PATCH for-2.7 0/5] spapr: Fix regression in CPU alias handling, Bharata B Rao, 2016/08/09
- Re: [Qemu-ppc] [Qemu-devel] [PATCH for-2.7 0/5] spapr: Fix regression in CPU alias handling, Thomas Huth, 2016/08/09