From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3d3C-0001e3-Ex for qemu-devel@nongnu.org; Tue, 01 Dec 2015 00:00:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3d3B-000546-BC for qemu-devel@nongnu.org; Tue, 01 Dec 2015 00:00:26 -0500 Date: Tue, 1 Dec 2015 15:47:32 +1100 From: David Gibson Message-ID: <20151201044732.GS31343@voom.redhat.com> References: <1447201710-10229-1-git-send-email-benh@kernel.crashing.org> <1447201710-10229-37-git-send-email-benh@kernel.crashing.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="XCAZszJJXrQJLz3d" Content-Disposition: inline In-Reply-To: <1447201710-10229-37-git-send-email-benh@kernel.crashing.org> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 36/77] ppc/xics: Use a helper to add a new ICS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Benjamin Herrenschmidt Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org --XCAZszJJXrQJLz3d Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 11, 2015 at 11:27:49AM +1100, Benjamin Herrenschmidt wrote: > Signed-off-by: Benjamin Herrenschmidt Hmm.. does it make sense for the helper to do the object_new() and add_child() as well? > --- > hw/intc/xics.c | 6 ++++++ > hw/intc/xics_spapr.c | 3 +-- > include/hw/ppc/xics.h | 1 + > 3 files changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 0c355f4..3cd696f 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -90,6 +90,12 @@ static void xics_common_reset(DeviceState *d) > } > } > =20 > +void xics_add_ics(XICSState *xics, ICSState *ics) > +{ > + ics->xics =3D xics; > + QLIST_INSERT_HEAD(&xics->ics, ics, list); > +} > + > static void xics_prop_get_nr_irqs(Object *obj, Visitor *v, > void *opaque, const char *name, Error = **errp) > { > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c > index 3092f8d..fc331d8 100644 > --- a/hw/intc/xics_spapr.c > +++ b/hw/intc/xics_spapr.c > @@ -263,8 +263,7 @@ static void xics_spapr_initfn(Object *obj) > =20 > ics =3D ICS(object_new(TYPE_ICS)); =20 > object_property_add_child(obj, "ics", OBJECT(ics), NULL); > - ics->xics =3D xics; > - QLIST_INSERT_HEAD(&xics->ics, ics, list); > + xics_add_ics(xics, ics); > } > =20 > static void xics_spapr_set_nr_irqs(XICSState *xics, uint32_t nr_irqs, Er= ror **errp) > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index 9e5b751..5acb329 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -191,5 +191,6 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool = lsi); > =20 > void xics_set_nr_servers(XICSState *icp, uint32_t nr_servers, Error **er= rp); > ICSState *xics_find_source(XICSState *icp, int irq); > +void xics_add_ics(XICSState *xics, ICSState *ics); > =20 > #endif /* __XICS_H__ */ --=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 --XCAZszJJXrQJLz3d Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWXSZkAAoJEGw4ysog2bOSwVwP/jc0z/NyYQJs2PdvsGrH840W M+V7imO5yhNGtYz9ue6cvU6gawecc69CYFbvRgSuDiYHkw8etV33onr0ZnWwMtA8 P9T2SJa9qdQ+LZywgFlewa6zDAxDrW4Om8o8p9n3yK5pqZXy1f3l4ewPokZw/zTi wnMrj1SK4xVXHInXINUft8lMdVZiT56jibCjZesXQBJQzxj8xKlTKyvwCOZrYLu0 Biu3ieOO5wAEoJ8BKPg1smM79JNGoiOVLXSu3WptuclPyMbjPhrhkaaAQ9oaePO9 /aj/klP+9cZxKEigxJR0OkkbL3M7YxCb1MAHEj7ms/Cd+3KcXLVAorTk3TXH4Bt7 Vci+5QOqAPXmk2SRrfiytO6O5X8fYNudbIfXZBisPxBkOlKgQiSOMcStdGzMzG+o yC2Etm2swxsJs9V1NsvgDfsrbj5O+jXQrwfRqh8CehbZGtM7a4ot/3CxQqS/TKoY hmfYeyHmlJubbTwhPX0lTigNX/4v92yiHjotNwz/fR96cOWhhCexrqa2JEaUxFXV FfjAnKu5baF3SqIqWFewzQ2+7KUddc8mfEXQD70BY6qOdBkdTvGd3+cXmbxx0L1k CM09G6dnBXcU8jpdEmvlKABCt904BmxmKVwIj7f6th4fA/QQrh+xyzddskBgYuql yHtJehbGXCTXFaU73NLc =WFBp -----END PGP SIGNATURE----- --XCAZszJJXrQJLz3d--