From: Eric Auger Date: Mon, 22 Nov 2021 18:17:17 +0000 (+0000) Subject: hw/intc/arm_gicv3_its: Revert version increments in vmstate_its X-Git-Tag: v6.2.0-rc2~5^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33a0c404fb90a3fa8eea6ebf5c535fc7bc0b9912;p=thirdparty%2Fqemu.git hw/intc/arm_gicv3_its: Revert version increments in vmstate_its Commit 18f6290a6a ("hw/intc: GICv3 ITS initial framework") incremented version_id and minimum_version_id fields of VMStateDescription vmstate_its. This breaks the migration between 6.2 and 6.1 with the following message: qemu-system-aarch64: savevm: unsupported version 1 for 'arm_gicv3_its' v0 qemu-system-aarch64: load of migration failed: Invalid argument Revert that change. Signed-off-by: Eric Auger Message-id: 20211122171020.1195483-1-eric.auger@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index 7d7f3882e76..90b85f1e25c 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -50,8 +50,6 @@ static int gicv3_its_post_load(void *opaque, int version_id) static const VMStateDescription vmstate_its = { .name = "arm_gicv3_its", - .version_id = 1, - .minimum_version_id = 1, .pre_save = gicv3_its_pre_save, .post_load = gicv3_its_post_load, .priority = MIG_PRI_GICV3_ITS,