* Peter Maydell (peter.mayd...@linaro.org) wrote:
> Contrary to the the impression given in docs/devel/migration.rst,
> the migration code does not run the pre_load hook for a
> subsection unless the subsection appears on the wire, and so
> this is not a place where you can set the default value for
> state for the "subsection not present" case. Instead this needs
> to be done in a pre_load hook for whatever is the parent VMSD
> of the subsection.
>
> We got this wrong in two of the subsection definitions in
> the GICv3 migration structs; fix this.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> hw/intc/arm_gicv3_common.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
> index e1a8999cf5b..8175889f1e7 100644
> --- a/hw/intc/arm_gicv3_common.c
> +++ b/hw/intc/arm_gicv3_common.c
> @@ -73,7 +73,7 @@ static const VMStateDescription vmstate_gicv3_cpu_virt = {
> }
> };
>
> -static int icc_sre_el1_reg_pre_load(void *opaque)
> +static int vmstate_gicv3_cpu_pre_load(void *opaque)
> {
> GICv3CPUState *cs = opaque;
>
> @@ -97,7 +97,6 @@ const VMStateDescription vmstate_gicv3_cpu_sre_el1 = {
> .name = "arm_gicv3_cpu/sre_el1",
> .version_id = 1,
> .minimum_version_id = 1,
> - .pre_load = icc_sre_el1_reg_pre_load,
> .needed = icc_sre_el1_reg_needed,
> .fields = (VMStateField[]) {
> VMSTATE_UINT64(icc_sre_el1, GICv3CPUState),
> @@ -109,6 +108,7 @@ static const VMStateDescription vmstate_gicv3_cpu = {
> .name = "arm_gicv3_cpu",
> .version_id = 1,
> .minimum_version_id = 1,
> + .pre_load = vmstate_gicv3_cpu_pre_load,
> .fields = (VMStateField[]) {
> VMSTATE_UINT32(level, GICv3CPUState),
> VMSTATE_UINT32(gicr_ctlr, GICv3CPUState),
> @@ -139,7 +139,7 @@ static const VMStateDescription vmstate_gicv3_cpu = {
> }
> };
>
> -static int gicv3_gicd_no_migration_shift_bug_pre_load(void *opaque)
> +static int gicv3_pre_load(void *opaque)
> {
> GICv3State *cs = opaque;
>
> @@ -210,7 +210,6 @@ const VMStateDescription
> vmstate_gicv3_gicd_no_migration_shift_bug = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = needed_always,
> - .pre_load = gicv3_gicd_no_migration_shift_bug_pre_load,
> .post_load = gicv3_gicd_no_migration_shift_bug_post_load,
> .fields = (VMStateField[]) {
> VMSTATE_BOOL(gicd_no_migration_shift_bug, GICv3State),
> @@ -222,6 +221,7 @@ static const VMStateDescription vmstate_gicv3 = {
> .name = "arm_gicv3",
> .version_id = 1,
> .minimum_version_id = 1,
> + .pre_load = gicv3_pre_load,
> .pre_save = gicv3_pre_save,
> .post_load = gicv3_post_load,
> .priority = MIG_PRI_GICV3,
> --
> 2.17.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
