From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB294C432C1 for ; Tue, 24 Sep 2019 07:41:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADB7920872 for ; Tue, 24 Sep 2019 07:41:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADB7920872 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCfSA-0001Rg-Tz for qemu-devel@archiver.kernel.org; Tue, 24 Sep 2019 03:41:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41464) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCfRH-0000uN-EZ for qemu-devel@nongnu.org; Tue, 24 Sep 2019 03:40:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCfRF-000083-RW for qemu-devel@nongnu.org; Tue, 24 Sep 2019 03:40:47 -0400 Received: from 1.mo68.mail-out.ovh.net ([46.105.41.146]:50185) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCfRF-00006z-Kx for qemu-devel@nongnu.org; Tue, 24 Sep 2019 03:40:45 -0400 Received: from player788.ha.ovh.net (unknown [10.109.160.253]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id CE9DA1448F5 for ; Tue, 24 Sep 2019 09:40:42 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player788.ha.ovh.net (Postfix) with ESMTPSA id 67356A1E20BE; Tue, 24 Sep 2019 07:40:38 +0000 (UTC) Date: Tue, 24 Sep 2019 09:40:37 +0200 From: Greg Kurz To: David Gibson Subject: Re: [PATCH 4/4] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes Message-ID: <20190924094037.345df6ff@bahia.lan> In-Reply-To: <20190924045952.11412-5-david@gibson.dropbear.id.au> References: <20190924045952.11412-1-david@gibson.dropbear.id.au> <20190924045952.11412-5-david@gibson.dropbear.id.au> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 14445858755049593318 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrvdelgdduvdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 46.105.41.146 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gkurz@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 24 Sep 2019 14:59:52 +1000 David Gibson 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 > 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 > --- Reviewed-by: Greg Kurz > hw/intc/xics.c | 57 ++++++++++++++++--------------------------- > hw/ppc/pnv_psi.c | 2 +- > hw/ppc/spapr_irq.c | 4 +-- > include/hw/ppc/xics.h | 17 ++----------- > 4 files changed, 26 insertions(+), 54 deletions(-) > > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 9ae51bbc76..388dbba870 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); > } > @@ -587,7 +587,7 @@ static void ics_reset_handler(void *dev) > > static void ics_realize(DeviceState *dev, Error **errp) > { > - ICSState *ics = ICS_BASE(dev); > + ICSState *ics = ICS(dev); > Error *local_err = NULL; > Object *obj; > > @@ -609,26 +609,14 @@ static void ics_realize(DeviceState *dev, Error **errp) > qemu_register_reset(ics_reset_handler, ics); > } > > -static void ics_simple_class_init(ObjectClass *klass, void *data) > +static void ics_instance_init(Object *obj) > { > -} > - > -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_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; > > @@ -639,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; > > @@ -657,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, > @@ -671,46 +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_realize; > - dc->props = ics_base_properties; > + 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, > - .class_size = sizeof(ICSStateClass), > + .instance_init = ics_instance_init, > + .class_init = ics_class_init, > }; > > static const TypeInfo xics_fabric_info = { > @@ -749,8 +735,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 92628e7cab..d8cf206a69 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -89,21 +89,8 @@ struct PnvICPState { > uint32_t links[3]; > }; > > -#define TYPE_ICS_BASE "ics-base" > -#define ICS_BASE(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_BASE) > - > -/* 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) > - > -struct ICSStateClass { > - DeviceClass parent_class; > -}; > +#define TYPE_ICS "ics" > +#define ICS(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS) > > struct ICSState { > /*< private >*/