From nobody Fri May 3 06:39:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486995671960119.29781265697875; Mon, 13 Feb 2017 06:21:11 -0800 (PST) Received: from localhost ([::1]:57138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdHV8-0001DL-Ip for importer@patchew.org; Mon, 13 Feb 2017 09:21:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdHKC-0000M3-SW for qemu-devel@nongnu.org; Mon, 13 Feb 2017 09:09:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdHK9-0008B6-Fb for qemu-devel@nongnu.org; Mon, 13 Feb 2017 09:09:52 -0500 Received: from 3.mo4.mail-out.ovh.net ([46.105.57.129]:57566) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdHK9-0008AG-6E for qemu-devel@nongnu.org; Mon, 13 Feb 2017 09:09:49 -0500 Received: from player772.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id D3DB548FA5 for ; Mon, 13 Feb 2017 15:09:47 +0100 (CET) Received: from zorba.ttt.fr.ibm.com (deibp9eh1--blueice1n3.emea.ibm.com [195.212.29.165]) (Authenticated sender: clg@kaod.org) by player772.ha.ovh.net (Postfix) with ESMTPSA id 437BB3C8; Mon, 13 Feb 2017 15:09:43 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 13 Feb 2017 15:09:16 +0100 Message-Id: <1486994957-20400-2-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486994957-20400-1-git-send-email-clg@kaod.org> References: <1486994957-20400-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13703046292519422950 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelgedrleefgdehkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.57.129 Subject: [Qemu-devel] [PATCH 1/2] ppc/xics: remove set_nr_irqs() handler from XICSStateClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Today, the ICS (Interrupt Controller Source) object is created and realized by the init and realize routines of the XICS object, but some of the parameters are only known at the machine level. These parameters are passed from the sPAPR machine to the ICS object in a rather convoluted way using property handlers and a class handler of the XICS object. The number of irqs required to allocate the IRQ state objects in the ICS realize routine is one of them. Let's simplify the process by creating the ICS object along with the XICS object at the machine level and link the ICS into the XICS list of ICSs at this level also. In the sPAPR machine, there is only a single ICS but that will change with the PowerNV machine. Also, QOMify the creation of the objects and get rid of the superfluous code. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 41 ++++++-------------------------------- hw/intc/xics_kvm.c | 34 -------------------------------- hw/intc/xics_spapr.c | 34 -------------------------------- hw/ppc/spapr.c | 54 ++++++++++++++++++++++++++++++++++++-----------= ---- include/hw/ppc/xics.h | 2 -- 5 files changed, 44 insertions(+), 121 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 095c16a30082..58e7f2f86ed4 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -151,38 +151,6 @@ static void xics_common_reset(DeviceState *d) } } =20 -static void xics_prop_get_nr_irqs(Object *obj, Visitor *v, const char *nam= e, - void *opaque, Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - int64_t value =3D xics->nr_irqs; - - visit_type_int(v, name, &value, errp); -} - -static void xics_prop_set_nr_irqs(Object *obj, Visitor *v, const char *nam= e, - void *opaque, Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - XICSStateClass *info =3D XICS_COMMON_GET_CLASS(xics); - Error *error =3D NULL; - int64_t value; - - visit_type_int(v, name, &value, &error); - if (error) { - error_propagate(errp, error); - return; - } - if (xics->nr_irqs) { - error_setg(errp, "Number of interrupts is already set to %u", - xics->nr_irqs); - return; - } - - assert(info->set_nr_irqs); - info->set_nr_irqs(xics, value, errp); -} - void xics_set_nr_servers(XICSState *xics, uint32_t nr_servers, const char *typename, Error **errp) { @@ -241,9 +209,6 @@ static void xics_common_initfn(Object *obj) XICSState *xics =3D XICS_COMMON(obj); =20 QLIST_INIT(&xics->ics); - object_property_add(obj, "nr_irqs", "int", - xics_prop_get_nr_irqs, xics_prop_set_nr_irqs, - NULL, NULL, NULL); object_property_add(obj, "nr_servers", "int", xics_prop_get_nr_servers, xics_prop_set_nr_servers, NULL, NULL, NULL); @@ -746,12 +711,18 @@ static void ics_simple_realize(DeviceState *dev, Erro= r **errp) ics->qirqs =3D qemu_allocate_irqs(ics_simple_set_irq, ics, ics->nr_irq= s); } =20 +static Property ics_simple_properties[] =3D { + DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void ics_simple_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); ICSStateClass *isc =3D ICS_BASE_CLASS(klass); =20 dc->realize =3D ics_simple_realize; + dc->props =3D ics_simple_properties; dc->vmsd =3D &vmstate_ics_simple; dc->reset =3D ics_simple_reset; isc->post_load =3D ics_simple_post_load; diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 17694eaa8709..6bb8c6d14865 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -358,18 +358,6 @@ static void xics_kvm_cpu_setup(XICSState *xics, PowerP= CCPU *cpu) ss->cap_irq_xics_enabled =3D true; } =20 -static void xics_kvm_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; - } -} - static void xics_kvm_set_nr_servers(XICSState *xics, uint32_t nr_servers, Error **errp) { @@ -389,7 +377,6 @@ static void xics_kvm_realize(DeviceState *dev, Error **= errp) { KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(dev); XICSState *xics =3D XICS_COMMON(dev); - ICSState *ics; int i, rc; Error *error =3D NULL; struct kvm_create_device xics_create_device =3D { @@ -441,14 +428,6 @@ static void xics_kvm_realize(DeviceState *dev, Error *= *errp) =20 xicskvm->kernel_xics_fd =3D xics_create_device.fd; =20 - QLIST_FOREACH(ics, &xics->ics, list) { - object_property_set_bool(OBJECT(ics), true, "realized", &error); - if (error) { - error_propagate(errp, error); - goto fail; - } - } - assert(xics->nr_servers); for (i =3D 0; i < xics->nr_servers; i++) { object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", @@ -472,17 +451,6 @@ fail: kvmppc_define_rtas_kernel_token(0, "ibm,int-off"); } =20 -static void xics_kvm_initfn(Object *obj) -{ - XICSState *xics =3D XICS_COMMON(obj); - ICSState *ics; - - ics =3D ICS_SIMPLE(object_new(TYPE_ICS_KVM)); - object_property_add_child(obj, "ics", OBJECT(ics), NULL); - ics->xics =3D xics; - QLIST_INSERT_HEAD(&xics->ics, ics, list); -} - static void xics_kvm_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -490,7 +458,6 @@ 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_kvm_set_nr_irqs; xsc->set_nr_servers =3D xics_kvm_set_nr_servers; } =20 @@ -499,7 +466,6 @@ static const TypeInfo xics_spapr_kvm_info =3D { .parent =3D TYPE_XICS_COMMON, .instance_size =3D sizeof(KVMXICSState), .class_init =3D xics_kvm_class_init, - .instance_init =3D xics_kvm_initfn, }; =20 static void xics_kvm_register_types(void) diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 2e3f1c5e95b2..03e42a866603 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -239,18 +239,6 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineS= tate *spapr, rtas_st(rets, 0, RTAS_OUT_SUCCESS); } =20 -static void xics_spapr_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; - } -} - static void xics_spapr_set_nr_servers(XICSState *xics, uint32_t nr_servers, Error **errp) { @@ -260,7 +248,6 @@ static void xics_spapr_set_nr_servers(XICSState *xics, = uint32_t nr_servers, static void xics_spapr_realize(DeviceState *dev, Error **errp) { XICSState *xics =3D XICS_SPAPR(dev); - ICSState *ics; Error *error =3D NULL; int i; =20 @@ -282,14 +269,6 @@ static void xics_spapr_realize(DeviceState *dev, Error= **errp) spapr_register_hypercall(H_EOI, h_eoi); spapr_register_hypercall(H_IPOLL, h_ipoll); =20 - QLIST_FOREACH(ics, &xics->ics, list) { - object_property_set_bool(OBJECT(ics), true, "realized", &error); - if (error) { - error_propagate(errp, error); - return; - } - } - for (i =3D 0; i < xics->nr_servers; i++) { object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", &error); @@ -300,24 +279,12 @@ static void xics_spapr_realize(DeviceState *dev, Erro= r **errp) } } =20 -static void xics_spapr_initfn(Object *obj) -{ - XICSState *xics =3D XICS_SPAPR(obj); - ICSState *ics; - - ics =3D ICS_SIMPLE(object_new(TYPE_ICS_SIMPLE)); - object_property_add_child(obj, "ics", OBJECT(ics), NULL); - ics->xics =3D xics; - QLIST_INSERT_HEAD(&xics->ics, ics, list); -} - 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_spapr_set_nr_irqs; xsc->set_nr_servers =3D xics_spapr_set_nr_servers; } =20 @@ -327,7 +294,6 @@ static const TypeInfo xics_spapr_info =3D { .instance_size =3D sizeof(XICSState), .class_size =3D sizeof(XICSStateClass), .class_init =3D xics_spapr_class_init, - .instance_init =3D xics_spapr_initfn, }; =20 #define ICS_IRQ_FREE(ics, srcno) \ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6f37288a7f66..c84b2f4f938e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -95,22 +95,43 @@ =20 #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift)) =20 -static XICSState *try_create_xics(const char *type, int nr_servers, - int nr_irqs, Error **errp) -{ - Error *err =3D NULL; - DeviceState *dev; +static XICSState *try_create_xics(const char *type, const char *type_ics, + int nr_servers, int nr_irqs, Error **err= p) +{ + Error *err =3D NULL, *local_err =3D NULL; + XICSState *xics; + ICSState *ics =3D NULL; + + xics =3D XICS_COMMON(object_new(type)); + qdev_set_parent_bus(DEVICE(xics), sysbus_get_default()); + object_property_set_int(OBJECT(xics), nr_servers, "nr_servers", &err); + object_property_set_bool(OBJECT(xics), true, "realized", &local_err); + error_propagate(&err, local_err); + if (err) { + goto error; + } =20 - dev =3D qdev_create(NULL, type); - qdev_prop_set_uint32(dev, "nr_servers", nr_servers); - qdev_prop_set_uint32(dev, "nr_irqs", nr_irqs); - object_property_set_bool(OBJECT(dev), true, "realized", &err); + ics =3D ICS_SIMPLE(object_new(type_ics)); + object_property_add_child(OBJECT(xics), "ics", OBJECT(ics), NULL); + object_property_set_int(OBJECT(ics), nr_irqs, "nr-irqs", &err); + object_property_set_bool(OBJECT(ics), true, "realized", &local_err); + error_propagate(&err, local_err); if (err) { - error_propagate(errp, err); - object_unparent(OBJECT(dev)); - return NULL; + goto error; + } + + ics->xics =3D xics; + QLIST_INSERT_HEAD(&xics->ics, ics, list); + + return xics; + +error: + error_propagate(errp, err); + if (ics) { + object_unparent(OBJECT(ics)); } - return XICS_COMMON(dev); + object_unparent(OBJECT(xics)); + return NULL; } =20 static XICSState *xics_system_init(MachineState *machine, @@ -122,8 +143,8 @@ static XICSState *xics_system_init(MachineState *machin= e, Error *err =3D NULL; =20 if (machine_kernel_irqchip_allowed(machine)) { - xics =3D try_create_xics(TYPE_XICS_SPAPR_KVM, nr_servers, nr_i= rqs, - &err); + xics =3D try_create_xics(TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, + nr_servers, nr_irqs, &err); } if (machine_kernel_irqchip_required(machine) && !xics) { error_reportf_err(err, @@ -134,7 +155,8 @@ static XICSState *xics_system_init(MachineState *machin= e, } =20 if (!xics) { - xics =3D try_create_xics(TYPE_XICS_SPAPR, nr_servers, nr_irqs, err= p); + xics =3D try_create_xics(TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, nr_serv= ers, + nr_irqs, errp); } =20 return xics; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index e8794aa5cba8..8f60f65dd464 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -74,7 +74,6 @@ struct XICSStateClass { SysBusDeviceClass parent_class; =20 void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); - void (*set_nr_irqs)(XICSState *icp, uint32_t nr_irqs, Error **errp); void (*set_nr_servers)(XICSState *icp, uint32_t nr_servers, Error **er= rp); }; =20 @@ -83,7 +82,6 @@ struct XICSState { SysBusDevice parent_obj; /*< public >*/ uint32_t nr_servers; - uint32_t nr_irqs; ICPState *ss; QLIST_HEAD(, ICSState) ics; }; --=20 2.7.4 From nobody Fri May 3 06:39:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 148699594284012.794616638782145; Mon, 13 Feb 2017 06:25:42 -0800 (PST) Received: from localhost ([::1]:57169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdHZV-00059a-DK for importer@patchew.org; Mon, 13 Feb 2017 09:25:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdHKH-0000QU-OK for qemu-devel@nongnu.org; Mon, 13 Feb 2017 09:10:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdHKE-0008C5-Cg for qemu-devel@nongnu.org; Mon, 13 Feb 2017 09:09:57 -0500 Received: from 6.mo4.mail-out.ovh.net ([188.165.36.253]:55043) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdHKE-0008Bl-3M for qemu-devel@nongnu.org; Mon, 13 Feb 2017 09:09:54 -0500 Received: from player772.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 79EFB48E50 for ; Mon, 13 Feb 2017 15:09:52 +0100 (CET) Received: from zorba.ttt.fr.ibm.com (deibp9eh1--blueice1n3.emea.ibm.com [195.212.29.165]) (Authenticated sender: clg@kaod.org) by player772.ha.ovh.net (Postfix) with ESMTPSA id E36623B8; Mon, 13 Feb 2017 15:09:47 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 13 Feb 2017 15:09:17 +0100 Message-Id: <1486994957-20400-3-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486994957-20400-1-git-send-email-clg@kaod.org> References: <1486994957-20400-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13704453669567695846 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelgedrleefgdehkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 188.165.36.253 Subject: [Qemu-devel] [PATCH 2/2] ppc/xics: remove set_nr_servers() handler from XICSStateClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Today, the ICP (Interrupt Controller Presenter) objects are created by the 'nr_servers' property handler of the XICS object and a class handler. They are realized in the XICS object realize routine. Let's simplify the process by creating the ICP objects along with the XICS object at the machine level. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 37 ------------------------------------- hw/intc/xics_kvm.c | 21 +-------------------- hw/intc/xics_spapr.c | 26 -------------------------- hw/ppc/spapr.c | 24 +++++++++++++++++------- 4 files changed, 18 insertions(+), 90 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 58e7f2f86ed4..002d142a4792 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -170,48 +170,11 @@ void xics_set_nr_servers(XICSState *xics, uint32_t nr= _servers, } } =20 -static void xics_prop_get_nr_servers(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - int64_t value =3D xics->nr_servers; - - visit_type_int(v, name, &value, errp); -} - -static void xics_prop_set_nr_servers(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - XICSStateClass *xsc =3D XICS_COMMON_GET_CLASS(xics); - Error *error =3D NULL; - int64_t value; - - visit_type_int(v, name, &value, &error); - if (error) { - error_propagate(errp, error); - return; - } - if (xics->nr_servers) { - error_setg(errp, "Number of servers is already set to %u", - xics->nr_servers); - return; - } - - assert(xsc->set_nr_servers); - xsc->set_nr_servers(xics, value, errp); -} - static void xics_common_initfn(Object *obj) { XICSState *xics =3D XICS_COMMON(obj); =20 QLIST_INIT(&xics->ics); - object_property_add(obj, "nr_servers", "int", - xics_prop_get_nr_servers, xics_prop_set_nr_servers, - NULL, NULL, NULL); } =20 static void xics_common_class_init(ObjectClass *oc, void *data) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 6bb8c6d14865..9ec33c9b0d94 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -358,12 +358,6 @@ static void xics_kvm_cpu_setup(XICSState *xics, PowerP= CCPU *cpu) ss->cap_irq_xics_enabled =3D true; } =20 -static void xics_kvm_set_nr_servers(XICSState *xics, uint32_t nr_servers, - Error **errp) -{ - xics_set_nr_servers(xics, nr_servers, TYPE_KVM_ICP, errp); -} - static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, uint32_t nargs, target_ulong args, @@ -376,9 +370,7 @@ static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineSta= te *spapr, static void xics_kvm_realize(DeviceState *dev, Error **errp) { KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(dev); - XICSState *xics =3D XICS_COMMON(dev); - int i, rc; - Error *error =3D NULL; + int rc; struct kvm_create_device xics_create_device =3D { .type =3D KVM_DEV_TYPE_XICS, .flags =3D 0, @@ -428,16 +420,6 @@ static void xics_kvm_realize(DeviceState *dev, Error *= *errp) =20 xicskvm->kernel_xics_fd =3D xics_create_device.fd; =20 - assert(xics->nr_servers); - for (i =3D 0; i < xics->nr_servers; i++) { - object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", - &error); - if (error) { - error_propagate(errp, error); - goto fail; - } - } - kvm_kernel_irqchip =3D true; kvm_msi_via_irqfd_allowed =3D true; kvm_gsi_direct_mapping =3D true; @@ -458,7 +440,6 @@ 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_servers =3D xics_kvm_set_nr_servers; } =20 static const TypeInfo xics_spapr_kvm_info =3D { diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 03e42a866603..859b5675e175 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -239,23 +239,8 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineS= tate *spapr, rtas_st(rets, 0, RTAS_OUT_SUCCESS); } =20 -static void xics_spapr_set_nr_servers(XICSState *xics, uint32_t nr_servers, - Error **errp) -{ - xics_set_nr_servers(xics, nr_servers, TYPE_ICP, errp); -} - static void xics_spapr_realize(DeviceState *dev, Error **errp) { - XICSState *xics =3D XICS_SPAPR(dev); - Error *error =3D NULL; - int i; - - if (!xics->nr_servers) { - error_setg(errp, "Number of servers needs to be greater 0"); - return; - } - /* Registration of global state belongs into realize */ spapr_rtas_register(RTAS_IBM_SET_XIVE, "ibm,set-xive", rtas_set_xive); spapr_rtas_register(RTAS_IBM_GET_XIVE, "ibm,get-xive", rtas_get_xive); @@ -268,24 +253,13 @@ static void xics_spapr_realize(DeviceState *dev, Erro= r **errp) spapr_register_hypercall(H_XIRR_X, h_xirr_x); spapr_register_hypercall(H_EOI, h_eoi); spapr_register_hypercall(H_IPOLL, h_ipoll); - - for (i =3D 0; i < xics->nr_servers; i++) { - object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", - &error); - if (error) { - error_propagate(errp, error); - return; - } - } } =20 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_servers =3D xics_spapr_set_nr_servers; } =20 static const TypeInfo xics_spapr_info =3D { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c84b2f4f938e..d7e484f75c55 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -96,17 +96,17 @@ #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift)) =20 static XICSState *try_create_xics(const char *type, const char *type_ics, - int nr_servers, int nr_irqs, Error **err= p) + const char *type_icp, int nr_servers, + int nr_irqs, Error **errp) { Error *err =3D NULL, *local_err =3D NULL; XICSState *xics; ICSState *ics =3D NULL; + int i; =20 xics =3D XICS_COMMON(object_new(type)); qdev_set_parent_bus(DEVICE(xics), sysbus_get_default()); - object_property_set_int(OBJECT(xics), nr_servers, "nr_servers", &err); - object_property_set_bool(OBJECT(xics), true, "realized", &local_err); - error_propagate(&err, local_err); + object_property_set_bool(OBJECT(xics), true, "realized", &err); if (err) { goto error; } @@ -123,6 +123,16 @@ static XICSState *try_create_xics(const char *type, co= nst char *type_ics, ics->xics =3D xics; QLIST_INSERT_HEAD(&xics->ics, ics, list); =20 + xics_set_nr_servers(xics, nr_servers, type_icp, NULL); + + for (i =3D 0; i < nr_servers; i++) { + object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", + &err); + if (err) { + goto error; + } + } + return xics; =20 error: @@ -144,7 +154,7 @@ static XICSState *xics_system_init(MachineState *machin= e, =20 if (machine_kernel_irqchip_allowed(machine)) { xics =3D try_create_xics(TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, - nr_servers, nr_irqs, &err); + TYPE_KVM_ICP, nr_servers, nr_irqs, &err= ); } if (machine_kernel_irqchip_required(machine) && !xics) { error_reportf_err(err, @@ -155,8 +165,8 @@ static XICSState *xics_system_init(MachineState *machin= e, } =20 if (!xics) { - xics =3D try_create_xics(TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, nr_serv= ers, - nr_irqs, errp); + xics =3D try_create_xics(TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, TYPE_IC= P, + nr_servers, nr_irqs, errp); } =20 return xics; --=20 2.7.4