From nobody Wed Nov 5 05:28:37 2025 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529918397458134.94595285995808; Mon, 25 Jun 2018 02:19:57 -0700 (PDT) Received: from localhost ([::1]:44994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNf5-0007ec-Fj for importer@patchew.org; Mon, 25 Jun 2018 05:19:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNcx-0006du-Ts for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXNct-0001Xs-2X for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:39 -0400 Received: from 9.mo69.mail-out.ovh.net ([46.105.56.78]:54825) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXNcs-0001WL-PI for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:35 -0400 Received: from player789.ha.ovh.net (unknown [10.109.122.46]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id CD757180F4 for ; Mon, 25 Jun 2018 11:17:31 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-TOU-1-49-10.w86-201.abo.wanadoo.fr [86.201.141.10]) (Authenticated sender: clg@kaod.org) by player789.ha.ovh.net (Postfix) with ESMTPSA id 6183A2600B3; Mon, 25 Jun 2018 11:17:26 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 25 Jun 2018 11:17:14 +0200 Message-Id: <20180625091718.18544-2-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180625091718.18544-1-clg@kaod.org> References: <20180625091718.18544-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12910412760279059430 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtiedrudefgddufecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.56.78 Subject: [Qemu-devel] [PATCH v2 1/5] ppc/xics: introduce a parent_realize in ICSStateClass 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Greg Kurz 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" This makes possible to move the common ICSState code of the realize handlers in the ics-base class. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/xics.h | 3 ++- hw/intc/xics.c | 37 ++++++++++++++++++++++--------------- hw/intc/xics_kvm.c | 20 +++++++++++++++----- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 4b04b295a772..44e96e640070 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -115,7 +115,8 @@ struct PnvICPState { struct ICSStateClass { DeviceClass parent_class; =20 - void (*realize)(ICSState *s, Error **errp); + DeviceRealize parent_realize; + void (*pre_save)(ICSState *s); int (*post_load)(ICSState *s, int version_id); void (*reject)(ICSState *s, uint32_t irq); diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 063491f38712..d6066d561fdc 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -618,30 +618,31 @@ static void ics_simple_initfn(Object *obj) ics->offset =3D XICS_IRQ_BASE; } =20 -static void ics_simple_realize(ICSState *ics, Error **errp) +static void ics_simple_realize(DeviceState *dev, Error **errp) { - if (!ics->nr_irqs) { - error_setg(errp, "Number of interrupts needs to be greater 0"); + ICSState *ics =3D ICS_SIMPLE(dev); + ICSStateClass *icsc =3D ICS_BASE_GET_CLASS(ics); + Error *local_err =3D NULL; + + icsc->parent_realize(dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); return; } - ics->irqs =3D g_malloc0(ics->nr_irqs * sizeof(ICSIRQState)); + ics->qirqs =3D qemu_allocate_irqs(ics_simple_set_irq, ics, ics->nr_irq= s); =20 qemu_register_reset(ics_simple_reset, ics); } =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 - isc->realize =3D ics_simple_realize; - dc->props =3D ics_simple_properties; + device_class_set_parent_realize(dc, ics_simple_realize, + &isc->parent_realize); + dc->vmsd =3D &vmstate_ics_simple; isc->reject =3D ics_simple_reject; isc->resend =3D ics_simple_resend; @@ -659,7 +660,6 @@ static const TypeInfo ics_simple_info =3D { =20 static void ics_base_realize(DeviceState *dev, Error **errp) { - ICSStateClass *icsc =3D ICS_BASE_GET_CLASS(dev); ICSState *ics =3D ICS_BASE(dev); Object *obj; Error *err =3D NULL; @@ -672,17 +672,24 @@ static void ics_base_realize(DeviceState *dev, Error = **errp) } ics->xics =3D XICS_FABRIC(obj); =20 - - if (icsc->realize) { - icsc->realize(ics, errp); + if (!ics->nr_irqs) { + error_setg(errp, "Number of interrupts needs to be greater 0"); + return; } + ics->irqs =3D g_malloc0(ics->nr_irqs * sizeof(ICSIRQState)); } =20 +static Property ics_base_properties[] =3D { + DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void ics_base_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D ics_base_realize; + dc->props =3D ics_base_properties; } =20 static const TypeInfo ics_base_info =3D { diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index f511e50a8020..1f27eb497981 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -345,13 +345,17 @@ static void ics_kvm_reset(void *dev) ics_set_kvm_state(ics, 1); } =20 -static void ics_kvm_realize(ICSState *ics, Error **errp) +static void ics_kvm_realize(DeviceState *dev, Error **errp) { - if (!ics->nr_irqs) { - error_setg(errp, "Number of interrupts needs to be greater 0"); + ICSState *ics =3D ICS_KVM(dev); + ICSStateClass *icsc =3D ICS_BASE_GET_CLASS(ics); + Error *local_err =3D NULL; + + icsc->parent_realize(dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); return; } - ics->irqs =3D g_malloc0(ics->nr_irqs * sizeof(ICSIRQState)); ics->qirqs =3D qemu_allocate_irqs(ics_kvm_set_irq, ics, ics->nr_irqs); =20 qemu_register_reset(ics_kvm_reset, ics); @@ -360,8 +364,14 @@ static void ics_kvm_realize(ICSState *ics, Error **err= p) static void ics_kvm_class_init(ObjectClass *klass, void *data) { ICSStateClass *icsc =3D ICS_BASE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); + + /* + * Use device_class_set_parent_realize() when ics-kvm inherits + * directly from ics-base and not from ics-simple anymore. + */ + dc->realize =3D ics_kvm_realize; =20 - icsc->realize =3D ics_kvm_realize; icsc->pre_save =3D ics_get_kvm_state; icsc->post_load =3D ics_set_kvm_state; icsc->synchronize_state =3D ics_synchronize_state; --=20 2.13.6