On Thu, Mar 18, 2021 at 10:38:01AM +0800, Gavin Shan wrote:
> A clock is added by commit aac63e0e6ea3 ("hw/char/pl011: add a clock
> input") since v5.2.0 which corresponds to virt-5.2 machine type. It
> causes backwards migration failure from upstream to downstream (v5.1.0)
> when the machine type is specified with virt-5.1.
>
> This fixes the issue by following instructions from section "Connecting
> subsections to properties" in docs/devel/migration.rst. With this applied,
> the PL011 clock is migrated based on the machine type.
>
> virt-5.2 or newer: migration
> virt-5.1 or older: non-migration
>
> Cc: [email protected] # v5.2.0+
> Fixes: aac63e0e6ea3 ("hw/char/pl011: add a clock input")
> Suggested-by: Andrew Jones <[email protected]>
> Signed-off-by: Gavin Shan <[email protected]>
> ---
> hw/char/pl011.c | 9 +++++++++
> hw/core/machine.c | 1 +
> include/hw/char/pl011.h | 1 +
> 3 files changed, 11 insertions(+)
Reviewed-by: Andrew Jones <[email protected]>
And I agree with applying to 5.2 stable.
Thanks,
drew
