On Mon, Jun 25, 2018 at 11:17:14AM +0200, Cédric Le Goater wrote: > This makes possible to move the common ICSState code of the realize > handlers in the ics-base class. > > Signed-off-by: Cédric Le Goater <c...@kaod.org>
Applied to ppc-for-3.0, thanks.
> ---
> 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;
>
> - 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 = XICS_IRQ_BASE;
> }
>
> -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 = ICS_SIMPLE(dev);
> + ICSStateClass *icsc = ICS_BASE_GET_CLASS(ics);
> + Error *local_err = NULL;
> +
> + icsc->parent_realize(dev, &local_err);
> + if (local_err) {
> + error_propagate(errp, local_err);
> return;
> }
> - ics->irqs = g_malloc0(ics->nr_irqs * sizeof(ICSIRQState));
> +
> ics->qirqs = qemu_allocate_irqs(ics_simple_set_irq, ics, ics->nr_irqs);
>
> qemu_register_reset(ics_simple_reset, ics);
> }
>
> -static Property ics_simple_properties[] = {
> - 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 = DEVICE_CLASS(klass);
> ICSStateClass *isc = ICS_BASE_CLASS(klass);
>
> - isc->realize = ics_simple_realize;
> - dc->props = ics_simple_properties;
> + device_class_set_parent_realize(dc, ics_simple_realize,
> + &isc->parent_realize);
> +
> dc->vmsd = &vmstate_ics_simple;
> isc->reject = ics_simple_reject;
> isc->resend = ics_simple_resend;
> @@ -659,7 +660,6 @@ static const TypeInfo ics_simple_info = {
>
> static void ics_base_realize(DeviceState *dev, Error **errp)
> {
> - ICSStateClass *icsc = ICS_BASE_GET_CLASS(dev);
> ICSState *ics = ICS_BASE(dev);
> Object *obj;
> Error *err = NULL;
> @@ -672,17 +672,24 @@ static void ics_base_realize(DeviceState *dev, Error
> **errp)
> }
> ics->xics = XICS_FABRIC(obj);
>
> -
> - 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 = g_malloc0(ics->nr_irqs * sizeof(ICSIRQState));
> }
>
> +static Property ics_base_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)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
>
> dc->realize = ics_base_realize;
> + dc->props = ics_base_properties;
> }
>
> static const TypeInfo ics_base_info = {
> 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);
> }
>
> -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 = ICS_KVM(dev);
> + ICSStateClass *icsc = ICS_BASE_GET_CLASS(ics);
> + Error *local_err = NULL;
> +
> + icsc->parent_realize(dev, &local_err);
> + if (local_err) {
> + error_propagate(errp, local_err);
> return;
> }
> - ics->irqs = g_malloc0(ics->nr_irqs * sizeof(ICSIRQState));
> ics->qirqs = qemu_allocate_irqs(ics_kvm_set_irq, ics, ics->nr_irqs);
>
> qemu_register_reset(ics_kvm_reset, ics);
> @@ -360,8 +364,14 @@ static void ics_kvm_realize(ICSState *ics, Error **errp)
> static void ics_kvm_class_init(ObjectClass *klass, void *data)
> {
> ICSStateClass *icsc = ICS_BASE_CLASS(klass);
> + DeviceClass *dc = 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 = ics_kvm_realize;
>
> - icsc->realize = ics_kvm_realize;
> icsc->pre_save = ics_get_kvm_state;
> icsc->post_load = ics_set_kvm_state;
> icsc->synchronize_state = ics_synchronize_state;
--
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
signature.asc
Description: PGP signature
