From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzw8X-00022P-Gw for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:39:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzw8S-0002qH-Uv for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:39:13 -0400 From: David Gibson Date: Fri, 28 Oct 2016 12:37:17 +1100 Message-Id: <1477618694-21019-17-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> References: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 16/73] ppc/xics: add a xics_set_nr_servers common routine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: agraf@suse.de, clg@kaod.org, thuth@redhat.com, lvivier@redhat.com, aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, mdroth@linux.vnet.ibm.com, bharata@linux.vnet.ibm.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson From: C=C3=A9dric Le Goater xics_spapr and xics_kvm nearly define the same 'set_nr_servers' handler. Only the type of the ICP differs. So let's make a common one to remove some duplicated code. Signed-off-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/intc/xics.c | 24 +++++++++++++++++++++--- hw/intc/xics_kvm.c | 13 +------------ hw/intc/xics_spapr.c | 13 +------------ include/hw/ppc/xics.h | 2 ++ 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 7fac964..c051eeb 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -183,6 +183,24 @@ static void xics_prop_set_nr_irqs(Object *obj, Visit= or *v, const char *name, info->set_nr_irqs(xics, value, errp); } =20 +void xics_set_nr_servers(XICSState *xics, uint32_t nr_servers, + const char *typename, Error **errp) +{ + int i; + + xics->nr_servers =3D nr_servers; + + xics->ss =3D g_malloc0(xics->nr_servers * sizeof(ICPState)); + for (i =3D 0; i < xics->nr_servers; i++) { + char name[32]; + ICPState *icp =3D &xics->ss[i]; + + object_initialize(icp, sizeof(*icp), typename); + snprintf(name, sizeof(name), "icp[%d]", i); + object_property_add_child(OBJECT(xics), name, OBJECT(icp), errp)= ; + } +} + static void xics_prop_get_nr_servers(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) @@ -198,7 +216,7 @@ static void xics_prop_set_nr_servers(Object *obj, Vis= itor *v, Error **errp) { XICSState *xics =3D XICS_COMMON(obj); - XICSStateClass *info =3D XICS_COMMON_GET_CLASS(xics); + XICSStateClass *xsc =3D XICS_COMMON_GET_CLASS(xics); Error *error =3D NULL; int64_t value; =20 @@ -213,8 +231,8 @@ static void xics_prop_set_nr_servers(Object *obj, Vis= itor *v, return; } =20 - assert(info->set_nr_servers); - info->set_nr_servers(xics, value, errp); + assert(xsc->set_nr_servers); + xsc->set_nr_servers(xics, value, errp); } =20 static void xics_common_initfn(Object *obj) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 9c2f198..17694ea 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -373,18 +373,7 @@ static void xics_kvm_set_nr_irqs(XICSState *xics, ui= nt32_t nr_irqs, static void xics_kvm_set_nr_servers(XICSState *xics, uint32_t nr_servers= , Error **errp) { - int i; - - xics->nr_servers =3D nr_servers; - - xics->ss =3D g_malloc0(xics->nr_servers * sizeof(ICPState)); - for (i =3D 0; i < xics->nr_servers; i++) { - char buffer[32]; - object_initialize(&xics->ss[i], sizeof(xics->ss[i]), TYPE_KVM_IC= P); - snprintf(buffer, sizeof(buffer), "icp[%d]", i); - object_property_add_child(OBJECT(xics), buffer, OBJECT(&xics->ss= [i]), - errp); - } + xics_set_nr_servers(xics, nr_servers, TYPE_KVM_ICP, errp); } =20 static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr, diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index e8d0623..a09e1b0 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -249,18 +249,7 @@ static void xics_spapr_set_nr_irqs(XICSState *xics, = uint32_t nr_irqs, static void xics_spapr_set_nr_servers(XICSState *xics, uint32_t nr_serve= rs, Error **errp) { - int i; - - xics->nr_servers =3D nr_servers; - - xics->ss =3D g_malloc0(xics->nr_servers * sizeof(ICPState)); - for (i =3D 0; i < xics->nr_servers; i++) { - char buffer[32]; - object_initialize(&xics->ss[i], sizeof(xics->ss[i]), TYPE_ICP); - snprintf(buffer, sizeof(buffer), "icp[%d]", i); - object_property_add_child(OBJECT(xics), buffer, OBJECT(&xics->ss= [i]), - errp); - } + xics_set_nr_servers(xics, nr_servers, TYPE_ICP, errp); } =20 static void xics_spapr_realize(DeviceState *dev, Error **errp) diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 66ae55d..573b192 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -188,6 +188,8 @@ void xics_spapr_free(XICSState *icp, int irq, int num= ); =20 void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu); +void xics_set_nr_servers(XICSState *xics, uint32_t nr_servers, + const char *typename, Error **errp); =20 /* Internal XICS interfaces */ int xics_get_cpu_index_by_dt_id(int cpu_dt_id); --=20 2.7.4