From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YabD5-00047t-Mp for qemu-devel@nongnu.org; Tue, 24 Mar 2015 22:38:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YabD0-0001c9-Fg for qemu-devel@nongnu.org; Tue, 24 Mar 2015 22:38:23 -0400 Date: Wed, 25 Mar 2015 13:39:02 +1100 From: David Gibson Message-ID: <20150325023902.GV25043@voom.fritz.box> References: <1427117764-23008-1-git-send-email-bharata@linux.vnet.ibm.com> <1427117764-23008-12-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="P3ueQkFGL7LDwHzi" Content-Disposition: inline In-Reply-To: <1427117764-23008-12-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v2 11/23] ppc: Create sockets and cores for CPUs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de --P3ueQkFGL7LDwHzi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 23, 2015 at 07:05:52PM +0530, Bharata B Rao wrote: > ppc machine init functions create individual CPU threads. Change this > for sPAPR by switching to socket creation. CPUs are created recursively > by socket and core instance init routines. >=20 > TODO: Switching to socket level CPU creation is done only for sPAPR > target now. >=20 > Signed-off-by: Bharata B Rao > --- > hw/ppc/cpu-core.c | 17 +++++++++++++++++ > hw/ppc/cpu-socket.c | 15 +++++++++++++++ > hw/ppc/spapr.c | 15 ++++++++------- > target-ppc/cpu.h | 1 + > target-ppc/translate_init.c | 46 +++++++++++++++++++++++++++++++++++++++= ++++++ > 5 files changed, 87 insertions(+), 7 deletions(-) >=20 > diff --git a/hw/ppc/cpu-core.c b/hw/ppc/cpu-core.c > index ed0481f..f60646d 100644 > --- a/hw/ppc/cpu-core.c > +++ b/hw/ppc/cpu-core.c > @@ -7,6 +7,8 @@ > =20 > #include "hw/qdev.h" > #include "hw/ppc/cpu-core.h" > +#include "hw/boards.h" > +#include > =20 > static int ppc_cpu_core_realize_child(Object *child, void *opaque) > { > @@ -32,10 +34,25 @@ static void ppc_cpu_core_class_init(ObjectClass *oc, = void *data) > dc->realize =3D ppc_cpu_core_realize; > } > =20 > +static void ppc_cpu_core_instance_init(Object *obj) > +{ > + int i; > + PowerPCCPU *cpu =3D NULL; > + MachineState *machine =3D MACHINE(qdev_get_machine()); > + > + for (i =3D 0; i < smp_threads; i++) { > + cpu =3D POWERPC_CPU(cpu_ppc_create(TYPE_POWERPC_CPU, machine->cp= u_model)); > + object_property_add_child(obj, "thread[*]", OBJECT(cpu), &error_= abort); > + object_unref(OBJECT(cpu)); > + } > +} > + > static const TypeInfo ppc_cpu_core_type_info =3D { > .name =3D TYPE_POWERPC_CPU_CORE, > .parent =3D TYPE_DEVICE, > .class_init =3D ppc_cpu_core_class_init, > + .instance_init =3D ppc_cpu_core_instance_init, > + .instance_size =3D sizeof(PowerPCCPUCore), The PowerPCCPUCore structure isn't defined in this patch (I assume it already existed), which suggests that setting the instance_size should have already been in an earlier patch. > }; > =20 > static void ppc_cpu_core_register_types(void) > diff --git a/hw/ppc/cpu-socket.c b/hw/ppc/cpu-socket.c > index 602a060..f901336 100644 > --- a/hw/ppc/cpu-socket.c > +++ b/hw/ppc/cpu-socket.c > @@ -8,6 +8,7 @@ > #include "hw/qdev.h" > #include "hw/ppc/cpu-socket.h" > #include "sysemu/cpus.h" > +#include "cpu.h" > =20 > static int ppc_cpu_socket_realize_child(Object *child, void *opaque) > { > @@ -33,10 +34,24 @@ static void ppc_cpu_socket_class_init(ObjectClass *oc= , void *data) > dc->realize =3D ppc_cpu_socket_realize; > } > =20 > +static void ppc_cpu_socket_instance_init(Object *obj) > +{ > + int i; > + Object *core; > + > + for (i =3D 0; i < smp_cores; i++) { > + core =3D object_new(TYPE_POWERPC_CPU_CORE); > + object_property_add_child(obj, "core[*]", core, &error_abort); > + object_unref(core); > + } > +} > + > static const TypeInfo ppc_cpu_socket_type_info =3D { > .name =3D TYPE_POWERPC_CPU_SOCKET, > .parent =3D TYPE_CPU_SOCKET, > .class_init =3D ppc_cpu_socket_class_init, > + .instance_init =3D ppc_cpu_socket_instance_init, > + .instance_size =3D sizeof(PowerPCCPUSocket), Likewise for PowerPCCPUSocket. > =20 > +/* > + * This is essentially same as cpu_generic_init() but without a set > + * realize call. > + */ In which case it would probably make more sense to have this be a generic function, and implement cpu_generic_init() in terms of it. > +CPUState *cpu_ppc_create(const char *typename, const char *cpu_model) > +{ > + char *str, *name, *featurestr; > + CPUState *cpu; > + ObjectClass *oc; > + CPUClass *cc; > + Error *err =3D NULL; > + > + str =3D g_strdup(cpu_model); > + name =3D strtok(str, ","); > + > + oc =3D cpu_class_by_name(typename, name); > + if (oc =3D=3D NULL) { > + g_free(str); > + return NULL; > + } > + > + cpu =3D CPU(object_new(object_class_get_name(oc))); > + cc =3D CPU_GET_CLASS(cpu); > + > + featurestr =3D strtok(NULL, ","); > + cc->parse_features(cpu, featurestr, &err); > + g_free(str); > + if (err !=3D NULL) { > + goto out; > + } > + > +out: > + if (err !=3D NULL) { > + error_report("%s", error_get_pretty(err)); > + error_free(err); > + object_unref(OBJECT(cpu)); > + return NULL; > + } > + > + return cpu; > +} > + > +/* > + * TODO: This can be removed when all powerpc targets are converted to > + * socket level CPU realization. > + */ > PowerPCCPU *cpu_ppc_init(const char *cpu_model) > { > return POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)); --=20 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 --P3ueQkFGL7LDwHzi Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVEh/GAAoJEGw4ysog2bOSjNAP/juUeDBgsHpJlKXv3MAd2Gh7 idyvkj765PH3RshMgOKGJs+bCEoSz4sbJi+aaPCmfdxGib95qjnCietKR1PWJ26q QOC0NtjUmJH7vvKScqEYFy2Bv5w/giIUyTuyuKmAKe7HQvhTiVfDesadkvYyihnv PXyYakpVpgM/xTu76/XyGcWnVjFJv+tsXfdKdYrBw4bESAWR+NbFK/ps+qys4axH EpytMEYFWtSHJHIgBYYVweJ2kANRtoyHZmSsNxOS2PXDnIisKg+7XF/Jq2SjppmY redyXKazimtwJ9ETc1VmAQbu9DAM+OEUrDY2GEPFidKLaldm4mJ2t/Sywu0sYbiT hxZTLG6RicoIM/vZar2FZ/SKC6XrM18miQFETdaWvSS7MabX0uimaqKscOvi4ggf NwS6ujaGJc0Grw1FeHCkvXw38bI9crDXqGP3777EKLG2c922Mi8XM3xAACI1TMwa wDzIA6iDWj6HDW9Gq1m5yvd1TnEl+pWFDYaxolJ7qnWOSn1QkuEX/6j/xuCaQowk ssOxG83QVmngTDWu+Lm0DOyOkN10wRfIWzA+LZ8kfXsRiEhyZLrGGn/3ULgN3rRI p8MXFvrMNABXVe5IsgcHUIPNm9L/w+xnd3Jk5DpLUXQ72xtJwMyie6RpFG13p5qb sPaL4TnFT3YO4iD6z+KL =TUEm -----END PGP SIGNATURE----- --P3ueQkFGL7LDwHzi--