OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc: spapr: use cpu type name directly 

replace sPAPRCPUCoreClass::cpu_class with cpu type name
since it were needed just to get that at points it were
accessed.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Igor Mammedov 2017-10-09 21:51:01 +02:00 committed by David Gibson
parent 44cd95e31a
commit b51d3c8818
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ppc/spapr.c
View File

@ -3161,8 +3161,7 @@ void spapr_core_release(DeviceState *dev)
if (smc->pre_2_10_has_unused_icps) { if (smc->pre_2_10_has_unused_icps) {
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc)); sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc));
const char *typename = object_class_get_name(scc->cpu_class); size_t size = object_type_get_instance_size(scc->cpu_type);
size_t size = object_type_get_instance_size(typename);
int i; int i;
for (i = 0; i < cc->nr_threads; i++) { for (i = 0; i < cc->nr_threads; i++) {
@ -3258,8 +3257,7 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
if (smc->pre_2_10_has_unused_icps) { if (smc->pre_2_10_has_unused_icps) {
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc)); sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc));
const char *typename = object_class_get_name(scc->cpu_class); size_t size = object_type_get_instance_size(scc->cpu_type);
size_t size = object_type_get_instance_size(typename);
int i; int i;
for (i = 0; i < cc->nr_threads; i++) { for (i = 0; i < cc->nr_threads; i++) {

14
hw/ppc/spapr_cpu_core.c
View File

@ -90,8 +90,7 @@ static void spapr_cpu_core_unrealizefn(DeviceState *dev, Error **errp)
{ {
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev)); sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
const char *typename = object_class_get_name(scc->cpu_class); size_t size = object_type_get_instance_size(scc->cpu_type);
size_t size = object_type_get_instance_size(typename);
CPUCore *cc = CPU_CORE(dev); CPUCore *cc = CPU_CORE(dev);
int i; int i;
@ -152,8 +151,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev)); sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
CPUCore *cc = CPU_CORE(OBJECT(dev)); CPUCore *cc = CPU_CORE(OBJECT(dev));
const char *typename = object_class_get_name(scc->cpu_class); size_t size;
size_t size = object_type_get_instance_size(typename);
Error *local_err = NULL; Error *local_err = NULL;
void *obj; void *obj;
int i, j; int i, j;
@ -164,6 +162,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
return; return;
} }
size = object_type_get_instance_size(scc->cpu_type);
sc->threads = g_malloc0(size * cc->nr_threads); sc->threads = g_malloc0(size * cc->nr_threads);
for (i = 0; i < cc->nr_threads; i++) { for (i = 0; i < cc->nr_threads; i++) {
char id[32]; char id[32];
@ -172,7 +171,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
obj = sc->threads + i * size; obj = sc->threads + i * size;
object_initialize(obj, size, typename); object_initialize(obj, size, scc->cpu_type);
cs = CPU(obj); cs = CPU(obj);
cpu = POWERPC_CPU(cs); cpu = POWERPC_CPU(cs);
cs->cpu_index = cc->core_id + i; cs->cpu_index = cc->core_id + i;
@ -230,14 +229,13 @@ void spapr_cpu_core_class_init(ObjectClass *oc, void *data)
dc->realize = spapr_cpu_core_realize; dc->realize = spapr_cpu_core_realize;
dc->unrealize = spapr_cpu_core_unrealizefn; dc->unrealize = spapr_cpu_core_unrealizefn;
dc->props = spapr_cpu_core_properties; dc->props = spapr_cpu_core_properties;
scc->cpu_class = cpu_class_by_name(TYPE_POWERPC_CPU, data); scc->cpu_type = data;
g_assert(scc->cpu_class);
} }
#define DEFINE_SPAPR_CPU_CORE_TYPE(cpu_model) \ #define DEFINE_SPAPR_CPU_CORE_TYPE(cpu_model) \
{ \ { \
.parent = TYPE_SPAPR_CPU_CORE, \ .parent = TYPE_SPAPR_CPU_CORE, \
.class_data = (void *) cpu_model, \ .class_data = (void *) POWERPC_CPU_TYPE_NAME(cpu_model), \
.class_init = spapr_cpu_core_class_init, \ .class_init = spapr_cpu_core_class_init, \
.name = SPAPR_CPU_CORE_TYPE_NAME(cpu_model), \ .name = SPAPR_CPU_CORE_TYPE_NAME(cpu_model), \
} }

2
include/hw/ppc/spapr_cpu_core.h
View File

@ -34,7 +34,7 @@ typedef struct sPAPRCPUCore {
typedef struct sPAPRCPUCoreClass { typedef struct sPAPRCPUCoreClass {
DeviceClass parent_class; DeviceClass parent_class;
ObjectClass *cpu_class; const char *cpu_type;
} sPAPRCPUCoreClass; } sPAPRCPUCoreClass;
char *spapr_get_cpu_core_type(const char *model); char *spapr_get_cpu_core_type(const char *model);

2
target/ppc/kvm.c
View File

@ -2514,7 +2514,7 @@ static int kvm_ppc_register_host_cpu_type(void)
type_info.instance_size = sizeof(sPAPRCPUCore); type_info.instance_size = sizeof(sPAPRCPUCore);
type_info.instance_init = NULL; type_info.instance_init = NULL;
type_info.class_init = spapr_cpu_core_class_init; type_info.class_init = spapr_cpu_core_class_init;
type_info.class_data = (void *) "host"; type_info.class_data = (void *) POWERPC_CPU_TYPE_NAME("host");
type_register(&type_info); type_register(&type_info);
g_free((void *)type_info.name); g_free((void *)type_info.name);
#endif #endif