Message ID | 20180806123445.1459-3-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Series | Arm migration fixes for 3.0 | expand |
Peter Maydell <peter.maydell@linaro.org> wrote: > 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> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com>
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index e58bc8b8105..e1a8999cf5b 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 }