Re: [PATCH for-7.1 2/4] hw/ppc: use qdev to register physical DRC vmstates

[David Gibson]

On Tue, Mar 22, 2022 at 03:38:52PM -0300, Daniel Henrique Barboza wrote:
> Similar to logical DRCs, let's convert physical DRCs to register their
> vmstates using dc->vmsd.
> 
> The same constraints with instance_id being set to spapr_drc_index()
> also applies in this case. However, since realize_physical() calls
> drc_realize(), qdev_set_legacy_instance_id() is already being set.

Ok, and you've verified that you don't need to set the legacy ID on
both "layers"?  That is, have you tested that you can migrate from
before this change to after?

> 
> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> ---
>  hw/ppc/spapr_drc.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index a5ef64d2a2..5a60885876 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -640,9 +640,6 @@ static void realize_physical(DeviceState *d, Error **errp)
>          return;
>      }
>  
> -    vmstate_register(VMSTATE_IF(drcp),
> -                     spapr_drc_index(SPAPR_DR_CONNECTOR(drcp)),
> -                     &vmstate_spapr_drc_physical, drcp);
>      qemu_register_reset(drc_physical_reset, drcp);
>  }
>  
> @@ -651,7 +648,6 @@ static void unrealize_physical(DeviceState *d)
>      SpaprDrcPhysical *drcp = SPAPR_DRC_PHYSICAL(d);
>  
>      drc_unrealize(d);
> -    vmstate_unregister(VMSTATE_IF(drcp), &vmstate_spapr_drc_physical, drcp);
>      qemu_unregister_reset(drc_physical_reset, drcp);
>  }
>  
> @@ -662,6 +658,8 @@ static void spapr_drc_physical_class_init(ObjectClass *k, 
> void *data)
>  
>      dk->realize = realize_physical;
>      dk->unrealize = unrealize_physical;
> +    dk->vmsd = &vmstate_spapr_drc_physical;
> +
>      drck->dr_entity_sense = physical_entity_sense;
>      drck->isolate = drc_isolate_physical;
>      drck->unisolate = drc_unisolate_physical;

-- 
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