aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-08-03 17:24:56 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-08-03 17:24:56 +0100
commit2751700c7f1f41e734cb36a14adfe6b9f286beb5 (patch)
treeedaeae9339bc4792fe7a10dbdf3f2dce1d31558b
parentf7502360397d291be04bc040e9f96c92ff2d8030 (diff)
downloadqemu-arm-2751700c7f1f41e734cb36a14adfe6b9f286beb5.tar.gz
hw/intc/arm_gicv3_common: Give no-migration-shift-bug subsection a needed function
Currently the migration code incorrectly treats a subsection with no .needed function pointer as if it was the subsection list terminator -- it is ignored and so is everything after it. Work around this by giving vmstate_gicv3_gicd_no_migration_shift_bug a 'needed' function that always returns true. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- This should go into 3.0 to avoid awkward migration compat problems: the no-migration-shift-bug subsection is new in 3.0.
-rw-r--r--hw/intc/arm_gicv3_common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index ff326b374a..e58bc8b810 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -203,10 +203,16 @@ static int gicv3_gicd_no_migration_shift_bug_post_load(void *opaque,
return 0;
}
+static bool needed_always(void *opaque)
+{
+ return true;
+}
+
const VMStateDescription vmstate_gicv3_gicd_no_migration_shift_bug = {
.name = "arm_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[]) {