From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3d3C-0001e4-OU 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-00054S-J1 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 00:00:26 -0500 Date: Tue, 1 Dec 2015 15:46:15 +1100 From: David Gibson Message-ID: <20151201044615.GR31343@voom.redhat.com> References: <1447201710-10229-1-git-send-email-benh@kernel.crashing.org> <1447201710-10229-36-git-send-email-benh@kernel.crashing.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="PPxI8paQBs33t8dK" Content-Disposition: inline In-Reply-To: <1447201710-10229-36-git-send-email-benh@kernel.crashing.org> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 35/77] ppc/xics: Move xics_set_nr_irqs() to xics_spapr.c and xics_kvm.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Benjamin Herrenschmidt Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org --PPxI8paQBs33t8dK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 11, 2015 at 11:27:48AM +1100, Benjamin Herrenschmidt wrote: > It will not be used by the native implementation. This allows us to > also remove the include of spapr.h from the common code >=20 > Signed-off-by: Benjamin Herrenschmidt > --- > hw/intc/xics.c | 12 ------------ > hw/intc/xics_kvm.c | 13 ++++++++++++- > hw/intc/xics_spapr.c | 13 ++++++++++++- > include/hw/ppc/xics.h | 1 - > 4 files changed, 24 insertions(+), 15 deletions(-) >=20 > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index c4ac057..0c355f4 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -28,7 +28,6 @@ > #include "hw/hw.h" > #include "trace.h" > #include "qemu/timer.h" > -#include "hw/ppc/spapr.h" > #include "hw/ppc/xics.h" > #include "qemu/error-report.h" > #include "qapi/visitor.h" > @@ -694,17 +693,6 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool= lsi) > * XICS > */ > =20 > -void xics_set_nr_irqs(XICSState *xics, uint32_t nr_irqs, Error **errp) > -{ > - ICSState *ics =3D QLIST_FIRST(&xics->ics); > - > - /* This needs to be deprecated ... */ > - xics->nr_irqs =3D nr_irqs; > - if (ics) { > - ics->nr_irqs =3D nr_irqs; > - } > -} > - > void xics_set_nr_servers(XICSState *xics, uint32_t nr_servers, Error **e= rrp) > { > int i; > diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c > index a478d25..6fbc715 100644 > --- a/hw/intc/xics_kvm.c > +++ b/hw/intc/xics_kvm.c > @@ -468,6 +468,17 @@ fail: > kvmppc_define_rtas_kernel_token(0, "ibm,int-off"); > } > =20 > +static void xics_kvm_set_nr_irqs(XICSState *xics, uint32_t nr_irqs, Erro= r **errp) > +{ > + ICSState *ics =3D QLIST_FIRST(&xics->ics); > + > + /* This needs to be deprecated ... */ > + xics->nr_irqs =3D nr_irqs; > + if (ics) { > + ics->nr_irqs =3D nr_irqs; > + } > +} > + Looks like you have a bit of unnecessary churn here, since you unified xics_kvm_set_nr_irqs() with xics_set_nr_irqs() earlier in the series only to split them again here. > static void xics_kvm_initfn(Object *obj) > { > XICSState *xics =3D XICS_COMMON(obj); > @@ -488,7 +499,7 @@ static void xics_kvm_class_init(ObjectClass *oc, void= *data) > =20 > dc->realize =3D xics_kvm_realize; > xsc->cpu_setup =3D xics_kvm_cpu_setup; > - xsc->set_nr_irqs =3D xics_set_nr_irqs; > + xsc->set_nr_irqs =3D xics_kvm_set_nr_irqs; > xsc->set_nr_servers =3D xics_kvm_set_nr_servers; > } > =20 > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c > index d75fcf0..3092f8d 100644 > --- a/hw/intc/xics_spapr.c > +++ b/hw/intc/xics_spapr.c > @@ -267,13 +267,24 @@ static void xics_spapr_initfn(Object *obj) > QLIST_INSERT_HEAD(&xics->ics, ics, list); > } > =20 > +static void xics_spapr_set_nr_irqs(XICSState *xics, uint32_t nr_irqs, Er= ror **errp) > +{ > + ICSState *ics =3D QLIST_FIRST(&xics->ics); > + > + /* This needs to be deprecated ... */ > + xics->nr_irqs =3D nr_irqs; > + if (ics) { > + ics->nr_irqs =3D nr_irqs; > + } > +} > + > static void xics_spapr_class_init(ObjectClass *oc, void *data) > { > DeviceClass *dc =3D DEVICE_CLASS(oc); > XICSStateClass *xsc =3D XICS_SPAPR_CLASS(oc); > =20 > dc->realize =3D xics_spapr_realize; > - xsc->set_nr_irqs =3D xics_set_nr_irqs; > + xsc->set_nr_irqs =3D xics_spapr_set_nr_irqs; > xsc->set_nr_servers =3D xics_set_nr_servers; > } > =20 > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index 51a63cb..9e5b751 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -189,7 +189,6 @@ void ics_write_xive(ICSState *ics, int nr, int server, > =20 > void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); > =20 > -void xics_set_nr_irqs(XICSState *icp, uint32_t nr_irqs, Error **errp); > void xics_set_nr_servers(XICSState *icp, uint32_t nr_servers, Error **er= rp); > ICSState *xics_find_source(XICSState *icp, int irq); > =20 --=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 --PPxI8paQBs33t8dK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWXSYWAAoJEGw4ysog2bOS89oQANcX/vY+ENGnC1MEpsv6p3iT /sEMzldLuWNBHTK9xmYJgM3eEV/oyNWb0vhSDQvdFlJbcPKB8/dBuvWOoUN8/FZu t1EL13XTyJJPA0PIKWkyqQn+PoIYMUZ4EdTuV4CqvEEddP1zFTERZObvrjRPo5U8 7KzB05WzYhohVUQOlYWIeNKXulhn4BXExy2v9hYq9iQYN11EMf3U785jA0pN/99c N3phTZPGFB/HiTWXHn4p6ylWIlrVUss3h1T+1GhRySwVo1uY1FbmQvzuym9c4WOG FXNPmXvgmeEHE3hfbT+ld4URNjhu6sPnqsoPPiP63sloI+I+zefkwchZkwjQGB9h blhZHhGF/mcYGPbT+RlqggpDSJ8O1i4QzyUge7SwLRYHjX9JO1CPc2cFIseWN7EF mr5DmYp+Yyi4jLzkXrwQ3lYJcs2pHZSXD+F8vZf49sSnOZF1VBoFJZ/Pk0a6BeIR 7qQi/cfh55RyIh1ihp3kin4VAoItCdTyUtELEaeAcK5RCjq5pcrJUOvznPsxzvcW a28HUfK3x3q+yBuHwHgK8xMAPUyDLkceRYEVL/F6Flow7lJ5lcT5U4O5t18S4v75 v0ZgaElV6K5z3slHlaFuK+6rKYyMZbfYEEbSgQ0at4ujnEiEmBLOgrCl+j1F2eSP qghSJvuBFl5zSI+8PkIz =fxoE -----END PGP SIGNATURE----- --PPxI8paQBs33t8dK--