aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-08-03 17:28:54 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-08-03 17:28:54 +0100
commitcbbb4944e6046db25cba73f4321039b587edc5cd (patch)
treeae9b00a90304108257497f971183d078f5e57313
parent2751700c7f1f41e734cb36a14adfe6b9f286beb5 (diff)
downloadqemu-arm-cbbb4944e6046db25cba73f4321039b587edc5cd.tar.gz
hw/intc/arm_gicv3_common: Combine duplicate .subsections in vmstate_gicv3_cpu
Commit 6692aac411199064 accidentally introduced a second initialization of the .subsections field of vmstate_gicv3_cpu, instead of adding the new subsection to the existing list. The effect of this was probably that migration of GICv3 with virtualization enabled was broken (or alternatively that migration of ICC_SRE_EL1 was broken, depending on which of the two initializers the compiler used). Combine the two into a single list. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Not strictly a 2.12 regression.
-rw-r--r--hw/intc/arm_gicv3_common.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index e58bc8b810..e1a8999cf5 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -134,9 +134,6 @@ static const VMStateDescription vmstate_gicv3_cpu = {
},
.subsections = (const VMStateDescription * []) {
&vmstate_gicv3_cpu_virt,
- NULL
- },
- .subsections = (const VMStateDescription * []) {
&vmstate_gicv3_cpu_sre_el1,
NULL
}