From nobody Mon Nov 3 18:06:06 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 From nobody Mon Nov 3 18:06:06 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 1529918402202775.8423648432159; Mon, 25 Jun 2018 02:20:02 -0700 (PDT) Received: from localhost ([::1]:44996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNfF-0007n5-FJ for importer@patchew.org; Mon, 25 Jun 2018 05:20:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNd2-0006ey-4B for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXNcw-0001bX-RK for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:43 -0400 Received: from 2.mo69.mail-out.ovh.net ([178.33.251.80]:38558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXNcw-0001aD-Kd for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:38 -0400 Received: from player789.ha.ovh.net (unknown [10.109.122.108]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id 1AF0D1A4AA for ; Mon, 25 Jun 2018 11:17:37 +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 95C1D2600AE; Mon, 25 Jun 2018 11:17:31 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 25 Jun 2018 11:17:15 +0200 Message-Id: <20180625091718.18544-3-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: 12911820135736904678 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: 178.33.251.80 Subject: [Qemu-devel] [PATCH v2 2/5] ppc/xics: move the instance_init handler under the ics-base class 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" Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index d6066d561fdc..83340770f7c0 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -611,13 +611,6 @@ static const VMStateDescription vmstate_ics_simple =3D= { }, }; =20 -static void ics_simple_initfn(Object *obj) -{ - ICSState *ics =3D ICS_SIMPLE(obj); - - ics->offset =3D XICS_IRQ_BASE; -} - static void ics_simple_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_SIMPLE(dev); @@ -655,7 +648,6 @@ static const TypeInfo ics_simple_info =3D { .instance_size =3D sizeof(ICSState), .class_init =3D ics_simple_class_init, .class_size =3D sizeof(ICSStateClass), - .instance_init =3D ics_simple_initfn, }; =20 static void ics_base_realize(DeviceState *dev, Error **errp) @@ -679,6 +671,13 @@ static void ics_base_realize(DeviceState *dev, Error *= *errp) ics->irqs =3D g_malloc0(ics->nr_irqs * sizeof(ICSIRQState)); } =20 +static void ics_base_instance_init(Object *obj) +{ + ICSState *ics =3D ICS_BASE(obj); + + ics->offset =3D XICS_IRQ_BASE; +} + static Property ics_base_properties[] =3D { DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0), DEFINE_PROP_END_OF_LIST(), @@ -697,6 +696,7 @@ static const TypeInfo ics_base_info =3D { .parent =3D TYPE_DEVICE, .abstract =3D true, .instance_size =3D sizeof(ICSState), + .instance_init =3D ics_base_instance_init, .class_init =3D ics_base_class_init, .class_size =3D sizeof(ICSStateClass), }; --=20 2.13.6 From nobody Mon Nov 3 18:06:06 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529918578166656.8920740832198; Mon, 25 Jun 2018 02:22:58 -0700 (PDT) Received: from localhost ([::1]:45016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNi5-0001oa-Bh for importer@patchew.org; Mon, 25 Jun 2018 05:22:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNd7-0006ic-4I for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXNd2-0001gQ-6y for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:49 -0400 Received: from 8.mo3.mail-out.ovh.net ([87.98.172.249]:40301) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXNd1-0001f7-Sl for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:44 -0400 Received: from player789.ha.ovh.net (unknown [10.109.105.107]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 4B2061BF310 for ; Mon, 25 Jun 2018 11:17:42 +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 CA63A2600A4; Mon, 25 Jun 2018 11:17:36 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 25 Jun 2018 11:17:16 +0200 Message-Id: <20180625091718.18544-4-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: 12913227507580767206 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: 87.98.172.249 Subject: [Qemu-devel] [PATCH v2 3/5] ppx/xics: introduce a parent_reset 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" Just like for the realize handlers, this makes possible to move the common ICSState code of the reset handlers in the ics-base class. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/xics.h | 1 + hw/intc/xics.c | 45 ++++++++++++++++++++++++++++++--------------- hw/intc/xics_kvm.c | 26 ++++++++++---------------- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 44e96e640070..6ac8a9392da6 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -116,6 +116,7 @@ struct ICSStateClass { DeviceClass parent_class; =20 DeviceRealize parent_realize; + DeviceReset parent_reset; =20 void (*pre_save)(ICSState *s); int (*post_load)(ICSState *s, int version_id); diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 83340770f7c0..8cfe2231531e 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -537,23 +537,16 @@ static void ics_simple_eoi(ICSState *ics, uint32_t nr) } } =20 -static void ics_simple_reset(void *dev) +static void ics_simple_reset(DeviceState *dev) { - ICSState *ics =3D ICS_SIMPLE(dev); - int i; - uint8_t flags[ics->nr_irqs]; + ICSStateClass *icsc =3D ICS_BASE_GET_CLASS(dev); =20 - for (i =3D 0; i < ics->nr_irqs; i++) { - flags[i] =3D ics->irqs[i].flags; - } - - memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs); + icsc->parent_reset(dev); +} =20 - for (i =3D 0; i < ics->nr_irqs; i++) { - ics->irqs[i].priority =3D 0xff; - ics->irqs[i].saved_priority =3D 0xff; - ics->irqs[i].flags =3D flags[i]; - } +static void ics_simple_reset_handler(void *dev) +{ + ics_simple_reset(dev); } =20 static int ics_simple_dispatch_pre_save(void *opaque) @@ -625,7 +618,7 @@ static void ics_simple_realize(DeviceState *dev, Error = **errp) =20 ics->qirqs =3D qemu_allocate_irqs(ics_simple_set_irq, ics, ics->nr_irq= s); =20 - qemu_register_reset(ics_simple_reset, ics); + qemu_register_reset(ics_simple_reset_handler, ics); } =20 static void ics_simple_class_init(ObjectClass *klass, void *data) @@ -635,6 +628,8 @@ static void ics_simple_class_init(ObjectClass *klass, v= oid *data) =20 device_class_set_parent_realize(dc, ics_simple_realize, &isc->parent_realize); + device_class_set_parent_reset(dc, ics_simple_reset, + &isc->parent_reset); =20 dc->vmsd =3D &vmstate_ics_simple; isc->reject =3D ics_simple_reject; @@ -650,6 +645,25 @@ static const TypeInfo ics_simple_info =3D { .class_size =3D sizeof(ICSStateClass), }; =20 +static void ics_base_reset(DeviceState *dev) +{ + ICSState *ics =3D ICS_BASE(dev); + int i; + uint8_t flags[ics->nr_irqs]; + + for (i =3D 0; i < ics->nr_irqs; i++) { + flags[i] =3D ics->irqs[i].flags; + } + + memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs); + + for (i =3D 0; i < ics->nr_irqs; i++) { + ics->irqs[i].priority =3D 0xff; + ics->irqs[i].saved_priority =3D 0xff; + ics->irqs[i].flags =3D flags[i]; + } +} + static void ics_base_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_BASE(dev); @@ -689,6 +703,7 @@ static void ics_base_class_init(ObjectClass *klass, voi= d *data) =20 dc->realize =3D ics_base_realize; dc->props =3D ics_base_properties; + dc->reset =3D ics_base_reset; } =20 static const TypeInfo ics_base_info =3D { diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 1f27eb497981..b314eb7d1607 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -324,25 +324,18 @@ static void ics_kvm_set_irq(void *opaque, int srcno, = int val) } } =20 -static void ics_kvm_reset(void *dev) +static void ics_kvm_reset(DeviceState *dev) { - ICSState *ics =3D ICS_SIMPLE(dev); - int i; - uint8_t flags[ics->nr_irqs]; - - for (i =3D 0; i < ics->nr_irqs; i++) { - flags[i] =3D ics->irqs[i].flags; - } + ICSStateClass *icsc =3D ICS_BASE_GET_CLASS(dev); =20 - memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs); + icsc->parent_reset(dev); =20 - for (i =3D 0; i < ics->nr_irqs; i++) { - ics->irqs[i].priority =3D 0xff; - ics->irqs[i].saved_priority =3D 0xff; - ics->irqs[i].flags =3D flags[i]; - } + ics_set_kvm_state(ICS_KVM(dev), 1); +} =20 - ics_set_kvm_state(ics, 1); +static void ics_kvm_reset_handler(void *dev) +{ + ics_kvm_reset(dev); } =20 static void ics_kvm_realize(DeviceState *dev, Error **errp) @@ -358,7 +351,7 @@ static void ics_kvm_realize(DeviceState *dev, Error **e= rrp) } ics->qirqs =3D qemu_allocate_irqs(ics_kvm_set_irq, ics, ics->nr_irqs); =20 - qemu_register_reset(ics_kvm_reset, ics); + qemu_register_reset(ics_kvm_reset_handler, ics); } =20 static void ics_kvm_class_init(ObjectClass *klass, void *data) @@ -371,6 +364,7 @@ static void ics_kvm_class_init(ObjectClass *klass, void= *data) * directly from ics-base and not from ics-simple anymore. */ dc->realize =3D ics_kvm_realize; + dc->reset =3D ics_kvm_reset; =20 icsc->pre_save =3D ics_get_kvm_state; icsc->post_load =3D ics_set_kvm_state; --=20 2.13.6 From nobody Mon Nov 3 18:06:06 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529918573849709.1854911867696; Mon, 25 Jun 2018 02:22:53 -0700 (PDT) Received: from localhost ([::1]:45015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNi1-0001li-3W for importer@patchew.org; Mon, 25 Jun 2018 05:22:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNdC-0006lH-Hp for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXNd7-0001mm-Nj for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:54 -0400 Received: from 12.mo1.mail-out.ovh.net ([87.98.162.229]:48838) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXNd7-0001kr-Gs for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:49 -0400 Received: from player789.ha.ovh.net (unknown [10.109.108.100]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 4F22610A76A for ; Mon, 25 Jun 2018 11:17:47 +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 0A0A12600AB; Mon, 25 Jun 2018 11:17:42 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 25 Jun 2018 11:17:17 +0200 Message-Id: <20180625091718.18544-5-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: 12914916357596810214 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: 87.98.162.229 Subject: [Qemu-devel] [PATCH v2 4/5] ppc/xics: move the vmstate structures under the ics-base class 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" Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 112 ++++++++++++++++++++++++++++-------------------------= ---- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 8cfe2231531e..b9f1a3c97214 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -549,61 +549,6 @@ static void ics_simple_reset_handler(void *dev) ics_simple_reset(dev); } =20 -static int ics_simple_dispatch_pre_save(void *opaque) -{ - ICSState *ics =3D opaque; - ICSStateClass *info =3D ICS_BASE_GET_CLASS(ics); - - if (info->pre_save) { - info->pre_save(ics); - } - - return 0; -} - -static int ics_simple_dispatch_post_load(void *opaque, int version_id) -{ - ICSState *ics =3D opaque; - ICSStateClass *info =3D ICS_BASE_GET_CLASS(ics); - - if (info->post_load) { - return info->post_load(ics, version_id); - } - - return 0; -} - -static const VMStateDescription vmstate_ics_simple_irq =3D { - .name =3D "ics/irq", - .version_id =3D 2, - .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { - VMSTATE_UINT32(server, ICSIRQState), - VMSTATE_UINT8(priority, ICSIRQState), - VMSTATE_UINT8(saved_priority, ICSIRQState), - VMSTATE_UINT8(status, ICSIRQState), - VMSTATE_UINT8(flags, ICSIRQState), - VMSTATE_END_OF_LIST() - }, -}; - -static const VMStateDescription vmstate_ics_simple =3D { - .name =3D "ics", - .version_id =3D 1, - .minimum_version_id =3D 1, - .pre_save =3D ics_simple_dispatch_pre_save, - .post_load =3D ics_simple_dispatch_post_load, - .fields =3D (VMStateField[]) { - /* Sanity check */ - VMSTATE_UINT32_EQUAL(nr_irqs, ICSState, NULL), - - VMSTATE_STRUCT_VARRAY_POINTER_UINT32(irqs, ICSState, nr_irqs, - vmstate_ics_simple_irq, - ICSIRQState), - VMSTATE_END_OF_LIST() - }, -}; - static void ics_simple_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_SIMPLE(dev); @@ -631,7 +576,6 @@ static void ics_simple_class_init(ObjectClass *klass, v= oid *data) device_class_set_parent_reset(dc, ics_simple_reset, &isc->parent_reset); =20 - dc->vmsd =3D &vmstate_ics_simple; isc->reject =3D ics_simple_reject; isc->resend =3D ics_simple_resend; isc->eoi =3D ics_simple_eoi; @@ -692,6 +636,61 @@ static void ics_base_instance_init(Object *obj) ics->offset =3D XICS_IRQ_BASE; } =20 +static int ics_base_dispatch_pre_save(void *opaque) +{ + ICSState *ics =3D opaque; + ICSStateClass *info =3D ICS_BASE_GET_CLASS(ics); + + if (info->pre_save) { + info->pre_save(ics); + } + + return 0; +} + +static int ics_base_dispatch_post_load(void *opaque, int version_id) +{ + ICSState *ics =3D opaque; + ICSStateClass *info =3D ICS_BASE_GET_CLASS(ics); + + if (info->post_load) { + return info->post_load(ics, version_id); + } + + return 0; +} + +static const VMStateDescription vmstate_ics_base_irq =3D { + .name =3D "ics/irq", + .version_id =3D 2, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(server, ICSIRQState), + VMSTATE_UINT8(priority, ICSIRQState), + VMSTATE_UINT8(saved_priority, ICSIRQState), + VMSTATE_UINT8(status, ICSIRQState), + VMSTATE_UINT8(flags, ICSIRQState), + VMSTATE_END_OF_LIST() + }, +}; + +static const VMStateDescription vmstate_ics_base =3D { + .name =3D "ics", + .version_id =3D 1, + .minimum_version_id =3D 1, + .pre_save =3D ics_base_dispatch_pre_save, + .post_load =3D ics_base_dispatch_post_load, + .fields =3D (VMStateField[]) { + /* Sanity check */ + VMSTATE_UINT32_EQUAL(nr_irqs, ICSState, NULL), + + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(irqs, ICSState, nr_irqs, + vmstate_ics_base_irq, + ICSIRQState), + VMSTATE_END_OF_LIST() + }, +}; + static Property ics_base_properties[] =3D { DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0), DEFINE_PROP_END_OF_LIST(), @@ -704,6 +703,7 @@ static void ics_base_class_init(ObjectClass *klass, voi= d *data) dc->realize =3D ics_base_realize; dc->props =3D ics_base_properties; dc->reset =3D ics_base_reset; + dc->vmsd =3D &vmstate_ics_base; } =20 static const TypeInfo ics_base_info =3D { --=20 2.13.6 From nobody Mon Nov 3 18:06:06 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529918610448393.4164982946363; Mon, 25 Jun 2018 02:23:30 -0700 (PDT) Received: from localhost ([::1]:45017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNib-00028f-Ja for importer@patchew.org; Mon, 25 Jun 2018 05:23:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNdH-0006pd-66 for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXNdC-0001sn-Dw for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:59 -0400 Received: from 6.mo179.mail-out.ovh.net ([46.105.56.76]:35381) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXNdC-0001qw-74 for qemu-devel@nongnu.org; Mon, 25 Jun 2018 05:17:54 -0400 Received: from player789.ha.ovh.net (unknown [10.109.122.15]) by mo179.mail-out.ovh.net (Postfix) with ESMTP id 9F7C9D4C70 for ; Mon, 25 Jun 2018 11:17:52 +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 3D1722600A4; Mon, 25 Jun 2018 11:17:47 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 25 Jun 2018 11:17:18 +0200 Message-Id: <20180625091718.18544-6-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: 12916323733505870822 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.76 Subject: [Qemu-devel] [PATCH v2 5/5] ppc/xics: rework the ICS classes inheritance tree 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" With the previous changes, we can now let the ICS_KVM class inherit directly from ICS_BASE class and not from the intermediate ICS_SIMPLE. It makes the class hierarchy much cleaner. What is left in the top classes is the low level interface to access the KVM XICS device in ICS_KVM and the XICS emulating handlers in ICS_SIMPLE. This should not break migration compatibility. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics_kvm.c | 12 +++++------- hw/ppc/spapr.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index b314eb7d1607..30c3769a2084 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -359,12 +359,10 @@ static void ics_kvm_class_init(ObjectClass *klass, vo= id *data) ICSStateClass *icsc =3D ICS_BASE_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - /* - * 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; - dc->reset =3D ics_kvm_reset; + device_class_set_parent_realize(dc, ics_kvm_realize, + &icsc->parent_realize); + device_class_set_parent_reset(dc, ics_kvm_reset, + &icsc->parent_reset); =20 icsc->pre_save =3D ics_get_kvm_state; icsc->post_load =3D ics_set_kvm_state; @@ -373,7 +371,7 @@ static void ics_kvm_class_init(ObjectClass *klass, void= *data) =20 static const TypeInfo ics_kvm_info =3D { .name =3D TYPE_ICS_KVM, - .parent =3D TYPE_ICS_SIMPLE, + .parent =3D TYPE_ICS_BASE, .instance_size =3D sizeof(ICSState), .class_init =3D ics_kvm_class_init, }; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0d032a1ad03c..8cc996d0b822 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -137,7 +137,7 @@ static ICSState *spapr_ics_create(sPAPRMachineState *sp= apr, goto error; } =20 - return ICS_SIMPLE(obj); + return ICS_BASE(obj); =20 error: error_propagate(errp, local_err); --=20 2.13.6