On Fri, Dec 18, 2020 at 11:33:55AM +0100, Greg Kurz wrote: > Non-transient DRCs are either in the empty or the ready state, > which means spapr_drc_reset() doesn't change their state. It > is thus not needed to do any checking. Call spapr_drc_reset() > unconditionally and squash spapr_drc_transient() into its > only user, spapr_drc_needed(). > > Signed-off-by: Greg Kurz <gr...@kaod.org>
Applied to ppc-fof-6.0, thanks.
> ---
> include/hw/ppc/spapr_drc.h | 3 ---
> hw/ppc/spapr_drc.c | 8 ++------
> hw/ppc/spapr_hcall.c | 7 ++++---
> 3 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h
> index def3593adc8b..cff5e707d0d9 100644
> --- a/include/hw/ppc/spapr_drc.h
> +++ b/include/hw/ppc/spapr_drc.h
> @@ -244,9 +244,6 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner,
> uint32_t drc_type_mask);
> void spapr_drc_attach(SpaprDrc *drc, DeviceState *d);
> void spapr_drc_detach(SpaprDrc *drc);
>
> -/* Returns true if a hot plug/unplug request is pending */
> -bool spapr_drc_transient(SpaprDrc *drc);
> -
> static inline bool spapr_drc_unplug_requested(SpaprDrc *drc)
> {
> return drc->unplug_requested;
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index fc7e321fcdf6..8d62f55066b6 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -462,8 +462,9 @@ static const VMStateDescription
> vmstate_spapr_drc_unplug_requested = {
> }
> };
>
> -bool spapr_drc_transient(SpaprDrc *drc)
> +static bool spapr_drc_needed(void *opaque)
> {
> + SpaprDrc *drc = opaque;
> SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
>
> /*
> @@ -483,11 +484,6 @@ bool spapr_drc_transient(SpaprDrc *drc)
> spapr_drc_unplug_requested(drc);
> }
>
> -static bool spapr_drc_needed(void *opaque)
> -{
> - return spapr_drc_transient(opaque);
> -}
> -
> static const VMStateDescription vmstate_spapr_drc = {
> .name = "spapr_drc",
> .version_id = 1,
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index c0ea0bd5794b..4e9d50c254f0 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -1650,9 +1650,10 @@ static void
> spapr_handle_transient_dev_before_cas(SpaprMachineState *spapr)
> prop->name,
> &error_abort));
>
> - if (spapr_drc_transient(drc)) {
> - spapr_drc_reset(drc);
> - }
> + /*
> + * This will complete any pending plug/unplug requests.
> + */
> + spapr_drc_reset(drc);
> }
>
> spapr_clear_pending_hotplug_events(spapr);
--
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
