From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gShHc-0001z1-W6 for qemu-devel@nongnu.org; Fri, 30 Nov 2018 06:48:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gShHc-0007sf-48 for qemu-devel@nongnu.org; Fri, 30 Nov 2018 06:48:32 -0500 Date: Fri, 30 Nov 2018 12:48:21 +0100 From: Igor Mammedov Message-ID: <20181130124821.292bd5c9@redhat.com> In-Reply-To: <20181127092801.21777-25-marcandre.lureau@redhat.com> References: <20181127092801.21777-1-marcandre.lureau@redhat.com> <20181127092801.21777-25-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-3.2 v4 24/28] arm: replace instance_post_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau Cc: qemu-devel@nongnu.org, Peter Maydell , "open list:ARM" On Tue, 27 Nov 2018 13:27:57 +0400 Marc-Andr=C3=A9 Lureau wrote: > Replace arm_cpu_post_init() instance callback by calling it from leaf > classes, to avoid potential the ordering issue with interfaces > post-init. >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > Suggested-by: Igor Mammedov > --- > target/arm/cpu.h | 2 ++ > target/arm/cpu.c | 15 ++++++++++++--- > target/arm/cpu64.c | 11 ++++++++++- > 3 files changed, 24 insertions(+), 4 deletions(-) >=20 > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 2a73fed9a0..84fba2b24b 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -884,6 +884,8 @@ static inline ARMCPU *arm_env_get_cpu(CPUARMState *en= v) > return container_of(env, ARMCPU, env); > } > =20 > +void arm_cpu_post_init(Object *obj); > + > uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz); > =20 > #define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e)) > diff --git a/target/arm/cpu.c b/target/arm/cpu.c > index 60411f6bfe..8a4aae7438 100644 > --- a/target/arm/cpu.c > +++ b/target/arm/cpu.c > @@ -734,7 +734,7 @@ static Property arm_cpu_pmsav7_dregion_property =3D > static Property arm_cpu_initsvtor_property =3D > DEFINE_PROP_UINT32("init-svtor", ARMCPU, init_svtor, 0); > =20 > -static void arm_cpu_post_init(Object *obj) > +void arm_cpu_post_init(Object *obj) > { > ARMCPU *cpu =3D ARM_CPU(obj); > =20 > @@ -2094,6 +2094,7 @@ static void arm_host_initfn(Object *obj) > ARMCPU *cpu =3D ARM_CPU(obj); > =20 > kvm_arm_set_cpu_features_from_host(cpu); > + arm_cpu_post_init(ARM_CPU(obj)); > } > =20 > static const TypeInfo host_arm_cpu_type_info =3D { > @@ -2108,14 +2109,23 @@ static const TypeInfo host_arm_cpu_type_info =3D { > =20 > #endif > =20 > +static void arm_cpu_instance_init(Object *obj) > +{ > + const ARMCPUInfo *info =3D object_class_get_class_data(object_get_cl= ass(obj)); > + > + info->initfn(obj); > + arm_cpu_post_init(obj); > +} now imagine leaf cpu class call chain: before patch: arm-cpu::initfn() cortex-a8::initfn() set feature AAA device_post_init() -> arm_cpu_post_init() if (AAA) do something =20 after patch: arm-cpu::initfn() -> arm_cpu_post_init() if (AAA) do something <--- won't happen anymore cortex-a8::initfn() arm_cpu_post_init() helper has to go to leaf classes only > + > static void cpu_register(const ARMCPUInfo *info) > { > TypeInfo type_info =3D { > .parent =3D TYPE_ARM_CPU, > .instance_size =3D sizeof(ARMCPU), > - .instance_init =3D info->initfn, > + .instance_init =3D arm_cpu_instance_init, > .class_size =3D sizeof(ARMCPUClass), > .class_init =3D info->class_init, > + .class_data =3D (void *)info, > }; > =20 > type_info.name =3D g_strdup_printf("%s-" TYPE_ARM_CPU, info->name); > @@ -2128,7 +2138,6 @@ static const TypeInfo arm_cpu_type_info =3D { > .parent =3D TYPE_CPU, > .instance_size =3D sizeof(ARMCPU), > .instance_init =3D arm_cpu_initfn, > - .instance_post_init =3D arm_cpu_post_init, > .instance_finalize =3D arm_cpu_finalizefn, > .abstract =3D true, > .class_size =3D sizeof(ARMCPUClass), > diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c > index 873f059bf2..dbfc3ee490 100644 > --- a/target/arm/cpu64.c > +++ b/target/arm/cpu64.c > @@ -447,14 +447,23 @@ static void aarch64_cpu_class_init(ObjectClass *oc,= void *data) > cc->gdb_arch_name =3D aarch64_gdb_arch_name; > } > =20 > +static void aarch64_cpu_instance_init(Object *obj) > +{ > + const ARMCPUInfo *info =3D object_class_get_class_data(object_get_cl= ass(obj)); > + > + info->initfn(obj); > + arm_cpu_post_init(obj); > +} > + > static void aarch64_cpu_register(const ARMCPUInfo *info) > { > TypeInfo type_info =3D { > .parent =3D TYPE_AARCH64_CPU, > .instance_size =3D sizeof(ARMCPU), > - .instance_init =3D info->initfn, > + .instance_init =3D aarch64_cpu_instance_init, > .class_size =3D sizeof(ARMCPUClass), > .class_init =3D info->class_init, > + .class_data =3D (void *)info, > }; > =20 > type_info.name =3D g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);