On Thu, Oct 05, 2017 at 06:24:41PM +0200, Igor Mammedov wrote: > 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 <imamm...@redhat.com>
Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> include/hw/ppc/spapr_cpu_core.h | 2 +-
> hw/ppc/spapr.c | 6 ++----
> hw/ppc/spapr_cpu_core.c | 13 +++++--------
> target/ppc/kvm.c | 2 +-
> 4 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_core.h
> index 66dcf52..264ce68 100644
> --- a/include/hw/ppc/spapr_cpu_core.h
> +++ b/include/hw/ppc/spapr_cpu_core.h
> @@ -34,7 +34,7 @@ typedef struct sPAPRCPUCore {
>
> typedef struct sPAPRCPUCoreClass {
> DeviceClass parent_class;
> - ObjectClass *cpu_class;
> + const char *cpu_type;
> } sPAPRCPUCoreClass;
>
> char *spapr_get_cpu_core_type(const char *model);
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 01b3012..ad7afd6 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3142,8 +3142,7 @@ void spapr_core_release(DeviceState *dev)
> if (smc->pre_2_10_has_unused_icps) {
> sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
> 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(typename);
> + size_t size = object_type_get_instance_size(scc->cpu_type);
> int i;
>
> for (i = 0; i < cc->nr_threads; i++) {
> @@ -3239,8 +3238,7 @@ static void spapr_core_plug(HotplugHandler
> *hotplug_dev, DeviceState *dev,
>
> if (smc->pre_2_10_has_unused_icps) {
> 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(typename);
> + size_t size = object_type_get_instance_size(scc->cpu_type);
> int i;
>
> for (i = 0; i < cc->nr_threads; i++) {
> diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> index 01f4ec8..8e13e52 100644
> --- a/hw/ppc/spapr_cpu_core.c
> +++ b/hw/ppc/spapr_cpu_core.c
> @@ -90,8 +90,7 @@ static void spapr_cpu_core_unrealizefn(DeviceState *dev,
> Error **errp)
> {
> sPAPRCPUCore *sc = SPAPR_CPU_CORE(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(typename);
> + size_t size = object_type_get_instance_size(scc->cpu_type);
> CPUCore *cc = CPU_CORE(dev);
> int i;
>
> @@ -152,8 +151,7 @@ static void spapr_cpu_core_realize(DeviceState *dev,
> Error **errp)
> sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
> sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
> CPUCore *cc = CPU_CORE(OBJECT(dev));
> - const char *typename = object_class_get_name(scc->cpu_class);
> - size_t size = object_type_get_instance_size(typename);
> + size_t size = object_type_get_instance_size(scc->cpu_type);
> Error *local_err = NULL;
> void *obj;
> int i, j;
> @@ -172,7 +170,7 @@ static void spapr_cpu_core_realize(DeviceState *dev,
> Error **errp)
>
> obj = sc->threads + i * size;
>
> - object_initialize(obj, size, typename);
> + object_initialize(obj, size, scc->cpu_type);
> cs = CPU(obj);
> cpu = POWERPC_CPU(cs);
> cs->cpu_index = cc->core_id + i;
> @@ -230,14 +228,13 @@ void spapr_cpu_core_class_init(ObjectClass *oc, void
> *data)
> dc->realize = spapr_cpu_core_realize;
> dc->unrealize = spapr_cpu_core_unrealizefn;
> dc->props = spapr_cpu_core_properties;
> - scc->cpu_class = cpu_class_by_name(TYPE_POWERPC_CPU, data);
> - g_assert(scc->cpu_class);
> + scc->cpu_type = data;
> }
>
> #define DEFINE_SPAPR_CPU_CORE_TYPE(cpu_model) \
> { \
> .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, \
> .name = SPAPR_CPU_CORE_TYPE_NAME(cpu_model), \
> }
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 171d3d8..c2152ed 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -2514,7 +2514,7 @@ static int kvm_ppc_register_host_cpu_type(void)
> type_info.instance_size = sizeof(sPAPRCPUCore);
> type_info.instance_init = NULL;
> 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);
> g_free((void *)type_info.name);
> #endif
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
