From: David Gibson <david@gibson.dropbear.id.au>
To: Greg Kurz <groug@kaod.org>
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>,
qemu-ppc@nongnu.org, clg@kaod.org,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH 05/20] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes
Date: Thu, 26 Sep 2019 10:55:44 +1000 [thread overview]
Message-ID: <20190926005544.GO17405@umbus> (raw)
In-Reply-To: <20190925103112.01feada6@bahia.lan>
[-- Attachment #1: Type: text/plain, Size: 11238 bytes --]
On Wed, Sep 25, 2019 at 10:31:12AM +0200, Greg Kurz wrote:
> On Wed, 25 Sep 2019 10:16:10 +0200
> Greg Kurz <groug@kaod.org> wrote:
>
> > On Wed, 25 Sep 2019 16:45:19 +1000
> > David Gibson <david@gibson.dropbear.id.au> wrote:
> >
> > > TYPE_ICS_SIMPLE is the only subtype of TYPE_ICS_BASE that's ever
> > > instantiated, and the only one we're ever likely to want. The
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> This seems to be kind of contradicted by the next patch BTW. Maybe just
> drop that to avoid confusion ? The rest of the changelog explains why we
> should merge the classes well enough IMHO.
Yeah, good point.
>
> > > existence of different classes is just a hang over from when we
> > > (misguidedly) had separate subtypes for the KVM and non-KVM version of
> > > the device.
> > >
> > > So, collapse the two classes together into just TYPE_ICS.
> > >
> > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > > ---
> >
> > So this also kills the realize hook, unlike in your previous series
> > where this was done along with the reset hook change. Makes sense
> > when merging parent/child class as well.
> >
> > Reviewed-by: Greg Kurz <groug@kaod.org>
> >
> > > hw/intc/xics.c | 86 ++++++++++++++-----------------------------
> > > hw/ppc/pnv_psi.c | 2 +-
> > > hw/ppc/spapr_irq.c | 4 +-
> > > include/hw/ppc/xics.h | 16 +++-----
> > > 4 files changed, 36 insertions(+), 72 deletions(-)
> > >
> > > diff --git a/hw/intc/xics.c b/hw/intc/xics.c
> > > index 82e6f09259..dfe7dbd254 100644
> > > --- a/hw/intc/xics.c
> > > +++ b/hw/intc/xics.c
> > > @@ -555,7 +555,7 @@ static void ics_reset_irq(ICSIRQState *irq)
> > >
> > > static void ics_reset(DeviceState *dev)
> > > {
> > > - ICSState *ics = ICS_BASE(dev);
> > > + ICSState *ics = ICS(dev);
> > > int i;
> > > uint8_t flags[ics->nr_irqs];
> > >
> > > @@ -573,7 +573,7 @@ static void ics_reset(DeviceState *dev)
> > > if (kvm_irqchip_in_kernel()) {
> > > Error *local_err = NULL;
> > >
> > > - ics_set_kvm_state(ICS_BASE(dev), &local_err);
> > > + ics_set_kvm_state(ICS(dev), &local_err);
> > > if (local_err) {
> > > error_report_err(local_err);
> > > }
> > > @@ -585,47 +585,15 @@ static void ics_reset_handler(void *dev)
> > > ics_reset(dev);
> > > }
> > >
> > > -static void ics_simple_realize(DeviceState *dev, Error **errp)
> > > +static void ics_realize(DeviceState *dev, Error **errp)
> > > {
> > > - ICSState *ics = ICS_SIMPLE(dev);
> > > - ICSStateClass *icsc = ICS_BASE_GET_CLASS(ics);
> > > + ICSState *ics = ICS(dev);
> > > Error *local_err = NULL;
> > > -
> > > - icsc->parent_realize(dev, &local_err);
> > > - if (local_err) {
> > > - error_propagate(errp, local_err);
> > > - return;
> > > - }
> > > -
> > > - qemu_register_reset(ics_reset_handler, ics);
> > > -}
> > > -
> > > -static void ics_simple_class_init(ObjectClass *klass, void *data)
> > > -{
> > > - DeviceClass *dc = DEVICE_CLASS(klass);
> > > - ICSStateClass *isc = ICS_BASE_CLASS(klass);
> > > -
> > > - device_class_set_parent_realize(dc, ics_simple_realize,
> > > - &isc->parent_realize);
> > > -}
> > > -
> > > -static const TypeInfo ics_simple_info = {
> > > - .name = TYPE_ICS_SIMPLE,
> > > - .parent = TYPE_ICS_BASE,
> > > - .instance_size = sizeof(ICSState),
> > > - .class_init = ics_simple_class_init,
> > > - .class_size = sizeof(ICSStateClass),
> > > -};
> > > -
> > > -static void ics_base_realize(DeviceState *dev, Error **errp)
> > > -{
> > > - ICSState *ics = ICS_BASE(dev);
> > > Object *obj;
> > > - Error *err = NULL;
> > >
> > > - obj = object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &err);
> > > + obj = object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &local_err);
> > > if (!obj) {
> > > - error_propagate_prepend(errp, err,
> > > + error_propagate_prepend(errp, local_err,
> > > "required link '" ICS_PROP_XICS
> > > "' not found: ");
> > > return;
> > > @@ -637,16 +605,18 @@ static void ics_base_realize(DeviceState *dev, Error **errp)
> > > return;
> > > }
> > > ics->irqs = g_malloc0(ics->nr_irqs * sizeof(ICSIRQState));
> > > +
> > > + qemu_register_reset(ics_reset_handler, ics);
> > > }
> > >
> > > -static void ics_base_instance_init(Object *obj)
> > > +static void ics_instance_init(Object *obj)
> > > {
> > > - ICSState *ics = ICS_BASE(obj);
> > > + ICSState *ics = ICS(obj);
> > >
> > > ics->offset = XICS_IRQ_BASE;
> > > }
> > >
> > > -static int ics_base_pre_save(void *opaque)
> > > +static int ics_pre_save(void *opaque)
> > > {
> > > ICSState *ics = opaque;
> > >
> > > @@ -657,7 +627,7 @@ static int ics_base_pre_save(void *opaque)
> > > return 0;
> > > }
> > >
> > > -static int ics_base_post_load(void *opaque, int version_id)
> > > +static int ics_post_load(void *opaque, int version_id)
> > > {
> > > ICSState *ics = opaque;
> > >
> > > @@ -675,7 +645,7 @@ static int ics_base_post_load(void *opaque, int version_id)
> > > return 0;
> > > }
> > >
> > > -static const VMStateDescription vmstate_ics_base_irq = {
> > > +static const VMStateDescription vmstate_ics_irq = {
> > > .name = "ics/irq",
> > > .version_id = 2,
> > > .minimum_version_id = 1,
> > > @@ -689,45 +659,44 @@ static const VMStateDescription vmstate_ics_base_irq = {
> > > },
> > > };
> > >
> > > -static const VMStateDescription vmstate_ics_base = {
> > > +static const VMStateDescription vmstate_ics = {
> > > .name = "ics",
> > > .version_id = 1,
> > > .minimum_version_id = 1,
> > > - .pre_save = ics_base_pre_save,
> > > - .post_load = ics_base_post_load,
> > > + .pre_save = ics_pre_save,
> > > + .post_load = ics_post_load,
> > > .fields = (VMStateField[]) {
> > > /* Sanity check */
> > > VMSTATE_UINT32_EQUAL(nr_irqs, ICSState, NULL),
> > >
> > > VMSTATE_STRUCT_VARRAY_POINTER_UINT32(irqs, ICSState, nr_irqs,
> > > - vmstate_ics_base_irq,
> > > + vmstate_ics_irq,
> > > ICSIRQState),
> > > VMSTATE_END_OF_LIST()
> > > },
> > > };
> > >
> > > -static Property ics_base_properties[] = {
> > > +static Property ics_properties[] = {
> > > DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0),
> > > DEFINE_PROP_END_OF_LIST(),
> > > };
> > >
> > > -static void ics_base_class_init(ObjectClass *klass, void *data)
> > > +static void ics_class_init(ObjectClass *klass, void *data)
> > > {
> > > DeviceClass *dc = DEVICE_CLASS(klass);
> > >
> > > - dc->realize = ics_base_realize;
> > > - dc->props = ics_base_properties;
> > > + dc->realize = ics_realize;
> > > + dc->props = ics_properties;
> > > dc->reset = ics_reset;
> > > - dc->vmsd = &vmstate_ics_base;
> > > + dc->vmsd = &vmstate_ics;
> > > }
> > >
> > > -static const TypeInfo ics_base_info = {
> > > - .name = TYPE_ICS_BASE,
> > > +static const TypeInfo ics_info = {
> > > + .name = TYPE_ICS,
> > > .parent = TYPE_DEVICE,
> > > - .abstract = true,
> > > .instance_size = sizeof(ICSState),
> > > - .instance_init = ics_base_instance_init,
> > > - .class_init = ics_base_class_init,
> > > + .instance_init = ics_instance_init,
> > > + .class_init = ics_class_init,
> > > .class_size = sizeof(ICSStateClass),
> > > };
> > >
> > > @@ -767,8 +736,7 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi)
> > >
> > > static void xics_register_types(void)
> > > {
> > > - type_register_static(&ics_simple_info);
> > > - type_register_static(&ics_base_info);
> > > + type_register_static(&ics_info);
> > > type_register_static(&icp_info);
> > > type_register_static(&xics_fabric_info);
> > > }
> > > diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
> > > index 8ea81e9d8e..a997f16bb4 100644
> > > --- a/hw/ppc/pnv_psi.c
> > > +++ b/hw/ppc/pnv_psi.c
> > > @@ -469,7 +469,7 @@ static void pnv_psi_power8_instance_init(Object *obj)
> > > Pnv8Psi *psi8 = PNV8_PSI(obj);
> > >
> > > object_initialize_child(obj, "ics-psi", &psi8->ics, sizeof(psi8->ics),
> > > - TYPE_ICS_SIMPLE, &error_abort, NULL);
> > > + TYPE_ICS, &error_abort, NULL);
> > > }
> > >
> > > static const uint8_t irq_to_xivr[] = {
> > > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> > > index ac189c5796..6c45d2a3c0 100644
> > > --- a/hw/ppc/spapr_irq.c
> > > +++ b/hw/ppc/spapr_irq.c
> > > @@ -98,7 +98,7 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_irqs,
> > > Object *obj;
> > > Error *local_err = NULL;
> > >
> > > - obj = object_new(TYPE_ICS_SIMPLE);
> > > + obj = object_new(TYPE_ICS);
> > > object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort);
> > > object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr),
> > > &error_fatal);
> > > @@ -109,7 +109,7 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_irqs,
> > > return;
> > > }
> > >
> > > - spapr->ics = ICS_BASE(obj);
> > > + spapr->ics = ICS(obj);
> > >
> > > xics_spapr_init(spapr);
> > > }
> > > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
> > > index 18fcd2b11c..5a9b73d144 100644
> > > --- a/include/hw/ppc/xics.h
> > > +++ b/include/hw/ppc/xics.h
> > > @@ -89,17 +89,13 @@ struct PnvICPState {
> > > uint32_t links[3];
> > > };
> > >
> > > -#define TYPE_ICS_BASE "ics-base"
> > > -#define ICS_BASE(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_BASE)
> > > +#define TYPE_ICS "ics"
> > > +#define ICS(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS)
> > >
> > > -/* Retain ics for sPAPR for migration from existing sPAPR guests */
> > > -#define TYPE_ICS_SIMPLE "ics"
> > > -#define ICS_SIMPLE(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SIMPLE)
> > > -
> > > -#define ICS_BASE_CLASS(klass) \
> > > - OBJECT_CLASS_CHECK(ICSStateClass, (klass), TYPE_ICS_BASE)
> > > -#define ICS_BASE_GET_CLASS(obj) \
> > > - OBJECT_GET_CLASS(ICSStateClass, (obj), TYPE_ICS_BASE)
> > > +#define ICS_CLASS(klass) \
> > > + OBJECT_CLASS_CHECK(ICSStateClass, (klass), TYPE_ICS)
> > > +#define ICS_GET_CLASS(obj) \
> > > + OBJECT_GET_CLASS(ICSStateClass, (obj), TYPE_ICS)
> > >
> > > struct ICSStateClass {
> > > DeviceClass parent_class;
> >
> >
>
--
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-09-26 1:34 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 6:45 [PATCH 00/20] spapr: IRQ subsystem cleanups David Gibson
2019-09-25 6:45 ` [PATCH 01/20] xics: Use incomplete type for XICSFabric David Gibson
2019-09-25 6:55 ` Cédric Le Goater
2019-09-25 7:48 ` Greg Kurz
2019-09-25 7:45 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 02/20] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-09-25 6:45 ` [PATCH 03/20] xics: Rename misleading ics_simple_*() functions David Gibson
2019-09-25 6:45 ` [PATCH 04/20] xics: Eliminate reset hook David Gibson
2019-09-25 7:33 ` Cédric Le Goater
2019-09-25 7:59 ` Greg Kurz
2019-09-26 2:54 ` David Gibson
2019-09-25 6:45 ` [PATCH 05/20] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-09-25 8:16 ` Greg Kurz
2019-09-25 8:31 ` Greg Kurz
2019-09-26 0:55 ` David Gibson [this message]
2019-09-26 0:52 ` David Gibson
2019-09-25 12:47 ` Cédric Le Goater
2019-09-25 6:45 ` [PATCH 06/20] xics: Create sPAPR specific ICS subtype David Gibson
2019-09-25 7:34 ` Cédric Le Goater
2019-09-25 8:40 ` Greg Kurz
2019-09-25 8:55 ` Cédric Le Goater
2019-09-25 9:07 ` Greg Kurz
2019-09-26 0:56 ` David Gibson
2019-09-26 7:09 ` Cédric Le Goater
2019-09-27 16:05 ` Greg Kurz
2019-09-30 8:45 ` David Gibson
2019-09-30 17:00 ` Greg Kurz
2019-10-01 1:45 ` David Gibson
2019-09-25 6:45 ` [PATCH 07/20] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:56 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 08/20] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:57 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 09/20] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-09-25 7:05 ` Cédric Le Goater
2019-09-26 1:03 ` David Gibson
2019-09-26 7:02 ` Cédric Le Goater
2019-09-25 17:13 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 10/20] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-09-25 7:06 ` Cédric Le Goater
2019-09-25 17:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 11/20] spapr: Fix indexing of XICS irqs David Gibson
2019-09-25 7:11 ` Cédric Le Goater
2019-09-25 20:17 ` Greg Kurz
2019-09-26 1:31 ` David Gibson
2019-09-26 7:21 ` Greg Kurz
2019-09-26 11:32 ` David Gibson
2019-09-26 14:44 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 12/20] spapr: Simplify spapr_qirq() handling David Gibson
2019-09-25 7:16 ` Cédric Le Goater
2019-09-25 20:30 ` Greg Kurz
2019-09-26 7:10 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 13/20] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-09-25 7:19 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:48 ` Greg Kurz
2019-09-26 11:36 ` David Gibson
2019-09-25 6:45 ` [PATCH 14/20] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-09-25 7:20 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:50 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 15/20] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-09-25 7:21 ` Cédric Le Goater
2019-09-26 7:52 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 16/20] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-09-25 7:22 ` Cédric Le Goater
2019-09-26 8:08 ` Greg Kurz
2019-09-26 11:39 ` David Gibson
2019-09-25 6:45 ` [PATCH 17/20] spapr: Remove unused return value in claim path David Gibson
2019-09-25 7:23 ` Cédric Le Goater
2019-09-26 7:13 ` Philippe Mathieu-Daudé
2019-09-26 8:36 ` Greg Kurz
2019-09-27 1:47 ` David Gibson
2019-09-25 6:45 ` [PATCH 18/20] xive: Improve irq claim/free path David Gibson
2019-09-25 7:25 ` Cédric Le Goater
2019-09-26 1:05 ` David Gibson
2019-09-25 6:45 ` [PATCH 19/20] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-09-25 7:28 ` Cédric Le Goater
2019-09-26 9:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 20/20] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-09-25 7:31 ` Cédric Le Goater
2019-09-26 1:13 ` David Gibson
2019-09-26 7:05 ` Cédric Le Goater
2019-09-26 11:29 ` David Gibson
2019-09-26 15:35 ` Greg Kurz
2019-09-27 5:51 ` David Gibson
2019-09-27 6:23 ` Greg Kurz
2019-09-26 15:39 ` Greg Kurz
2019-09-27 14:12 ` Greg Kurz
2019-09-29 9:34 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190926005544.GO17405@umbus \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).