From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8JRq-0007oF-JI for qemu-devel@nongnu.org; Wed, 01 Jun 2016 23:37:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8JRo-0008EG-O2 for qemu-devel@nongnu.org; Wed, 01 Jun 2016 23:37:30 -0400 Date: Thu, 2 Jun 2016 13:38:58 +1000 From: David Gibson Message-ID: <20160602033858.GM15455@voom.fritz.box> References: <1463024905-28401-1-git-send-email-bharata@linux.vnet.ibm.com> <1463024905-28401-7-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EE8jvUPYYQjJtG7J" Content-Disposition: inline In-Reply-To: <1463024905-28401-7-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [for-2.7 PATCH v3 06/15] cpu: Abstract CPU core type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, afaerber@suse.de, imammedo@redhat.com, armbru@redhat.com, thuth@redhat.com, aik@ozlabs.ru, agraf@suse.de, pbonzini@redhat.com, ehabkost@redhat.com, pkrempa@redhat.com, mdroth@linux.vnet.ibm.com, eblake@redhat.com, mjrosato@linux.vnet.ibm.com, borntraeger@de.ibm.com --EE8jvUPYYQjJtG7J Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 12, 2016 at 09:18:16AM +0530, Bharata B Rao wrote: > Add an abstract CPU core type that could be used by machines that want > to define and hotplug CPUs in core granularity. >=20 > Signed-off-by: Bharata B Rao > Signed-off-by: Igor Mammedov > [Integer core property] > Reviewed-by: David Gibson Igor, Eduardo, Do you think we're comfortable enough with this abstract core concept to merge it now? If so which tree should it go through? > --- > hw/cpu/Makefile.objs | 1 + > hw/cpu/core.c | 88 +++++++++++++++++++++++++++++++++++++++++++++= ++++++ > include/hw/cpu/core.h | 31 ++++++++++++++++++ > 3 files changed, 120 insertions(+) > create mode 100644 hw/cpu/core.c > create mode 100644 include/hw/cpu/core.h >=20 > diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs > index 0954a18..942a4bb 100644 > --- a/hw/cpu/Makefile.objs > +++ b/hw/cpu/Makefile.objs > @@ -2,4 +2,5 @@ obj-$(CONFIG_ARM11MPCORE) +=3D arm11mpcore.o > obj-$(CONFIG_REALVIEW) +=3D realview_mpcore.o > obj-$(CONFIG_A9MPCORE) +=3D a9mpcore.o > obj-$(CONFIG_A15MPCORE) +=3D a15mpcore.o > +obj-y +=3D core.o > =20 > diff --git a/hw/cpu/core.c b/hw/cpu/core.c > new file mode 100644 > index 0000000..fa5bc82 > --- /dev/null > +++ b/hw/cpu/core.c > @@ -0,0 +1,88 @@ > +/* > + * CPU core abstract device > + * > + * Copyright (C) 2016 Bharata B Rao > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. > + * See the COPYING file in the top-level directory. > + */ > +#include "hw/cpu/core.h" > +#include "qapi/visitor.h" > +#include "qapi/error.h" > +#include "sysemu/cpus.h" > + > +static void core_prop_get_core(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + CPUCore *core =3D CPU_CORE(obj); > + int64_t value =3D core->core; > + > + visit_type_int(v, name, &value, errp); > +} > + > +static void core_prop_set_core(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + CPUCore *core =3D CPU_CORE(obj); > + Error *local_err =3D NULL; > + int64_t value; > + > + visit_type_int(v, name, &value, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > + core->core =3D value; > +} > + > +static void core_prop_get_threads(Object *obj, Visitor *v, const char *n= ame, > + void *opaque, Error **errp) > +{ > + CPUCore *core =3D CPU_CORE(obj); > + int64_t value =3D core->threads; > + > + visit_type_int(v, name, &value, errp); > +} > + > +static void core_prop_set_threads(Object *obj, Visitor *v, const char *n= ame, > + void *opaque, Error **errp) > +{ > + CPUCore *core =3D CPU_CORE(obj); > + Error *local_err =3D NULL; > + int64_t value; > + > + visit_type_int(v, name, &value, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > + core->threads =3D value; > +} > + > +static void cpu_core_instance_init(Object *obj) > +{ > + CPUCore *core =3D CPU_CORE(obj); > + > + object_property_add(obj, "core", "int", core_prop_get_core, > + core_prop_set_core, NULL, NULL, NULL); > + object_property_add(obj, "threads", "int", core_prop_get_threads, > + core_prop_set_threads, NULL, NULL, NULL); > + core->threads =3D smp_threads; > +} > + > +static const TypeInfo cpu_core_type_info =3D { > + .name =3D TYPE_CPU_CORE, > + .parent =3D TYPE_DEVICE, > + .abstract =3D true, > + .instance_size =3D sizeof(CPUCore), > + .instance_init =3D cpu_core_instance_init, > +}; > + > +static void cpu_core_register_types(void) > +{ > + type_register_static(&cpu_core_type_info); > +} > + > +type_init(cpu_core_register_types) > diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h > new file mode 100644 > index 0000000..a2a5a04 > --- /dev/null > +++ b/include/hw/cpu/core.h > @@ -0,0 +1,31 @@ > +/* > + * CPU core abstract device > + * > + * Copyright (C) 2016 Bharata B Rao > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. > + * See the COPYING file in the top-level directory. > + */ > +#ifndef HW_CPU_CORE_H > +#define HW_CPU_CORE_H > + > +#include "qemu/osdep.h" > +#include "hw/qdev.h" > + > +#define TYPE_CPU_CORE "cpu-core" > + > +#define CPU_CORE(obj) \ > + OBJECT_CHECK(CPUCore, (obj), TYPE_CPU_CORE) > + > +typedef struct CPUCore { > + /*< private >*/ > + DeviceState parent_obj; > + > + /*< public >*/ > + int core; > + int threads; > +} CPUCore; > + > +#define CPU_CORE_PROP_CORE "core" > + > +#endif --=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 --EE8jvUPYYQjJtG7J Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXT6pSAAoJEGw4ysog2bOSzK8QAJ6KSGgMzJzoTkZdJk2KGM4Q AkI7E2C2IIGN9cz+iCqlWnq0yHVQw02l6qvYHOMdTg291xNda4W0NK8+Nr1t7Y4c 19/U4p7wq7r8s2wZk1KaWKNCiUQf8jmMY+3H81gQClUuQRH5OVWFZ8ZWHbXfZNfg NrQunPzUNANREEjj4vzuKB27WvFgljqsnC4WQsmfC70s3lBXw/1CHnaIwDOw2awL EvbprPUqROMxxxDwfT4Ck1fkUOk2636HeFE4S0w2NfZ+d3/dOP3Nm/i8uIrRCTla s/DO5JW2kGSH45hnjQO48rclYgDa+sqfb3WrwtaX2XfPQOAwVFHYc/RuQQx887Kz 4TqusrxrsKXMt6DOM/vwrdK/UHzYu+cnwT61X5cM6Sn8NrNx6BFlqm+4zUkFr6q5 ZATpSjX4CMMyQYcNMXZ8s4qVnPmDsX/2/L59aKrTXdy0uRQogEwKIGnm0NhjqraW 7S6upBFwYfUlVbXT/9MIbhaCqrhqJzFfQ7d+kkF432e1+6h+nBaorY5onlkIaV9z 3E5WsGUcsn9m70QuwCbchQ+1eXqiBXQmaC8HWyn512Jk4rKebeL0gcQg9W+X7qiY sfEU8/k+IecIIG+ZFVtHEReL5pTDX5wAVJ+IwZ13kqziKO+80EV00XCH/kaDxH0E y0TB1CuRXfGJ/hdmQwjw =KzTj -----END PGP SIGNATURE----- --EE8jvUPYYQjJtG7J--