On Mon, May 03, 2021 at 04:18:49PM +0100, Peter Maydell wrote: > The pnv_psi.c code uses device_legacy_reset() for two purposes: > * to reset itself from its qemu_register_reset() handler > * to reset a XiveSource object it has > > Neither it nor the XiveSource have any qbuses, so the new > device_cold_reset() function (which resets both the device and its > child buses) is equivalent here to device_legacy_reset() and we can > just switch to the new API. > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Applied to ppc-for-6.1.
> ---
> hw/ppc/pnv_psi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
> index 3e868c8c8da..292b373f93f 100644
> --- a/hw/ppc/pnv_psi.c
> +++ b/hw/ppc/pnv_psi.c
> @@ -466,7 +466,7 @@ static void pnv_psi_reset(DeviceState *dev)
>
> static void pnv_psi_reset_handler(void *dev)
> {
> - device_legacy_reset(DEVICE(dev));
> + device_cold_reset(DEVICE(dev));
> }
>
> static void pnv_psi_realize(DeviceState *dev, Error **errp)
> @@ -710,7 +710,7 @@ static void pnv_psi_p9_mmio_write(void *opaque, hwaddr
> addr,
> break;
> case PSIHB9_INTERRUPT_CONTROL:
> if (val & PSIHB9_IRQ_RESET) {
> - device_legacy_reset(DEVICE(&psi9->source));
> + device_cold_reset(DEVICE(&psi9->source));
> }
> psi->regs[reg] = val;
> break;
--
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
