diff options
| author | Greg Kurz <groug@kaod.org> | 2020-12-18 11:33:55 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2021-01-06 11:09:59 +1100 |
| commit | cd725bd7489e52445a15dd2f0ad1aa746dfa91fc (patch) | |
| tree | 0318231c1712e60dfc5b9c23748773eeaab6a5e6 /hw | |
| parent | 30499fdd9883026e106d74e8199e2f1311fd4011 (diff) | |
spapr: Call spapr_drc_reset() for all DRCs at CAS
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 <groug@kaod.org>
Message-Id: <20201218103400.689660-2-groug@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc/spapr_drc.c | 8 | ||||
| -rw-r--r-- | hw/ppc/spapr_hcall.c | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index fc7e321fcd..8d62f55066 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 c0ea0bd579..4e9d50c254 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); |