From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fldYk-0005G8-IV for qemu-devel@nongnu.org; Fri, 03 Aug 2018 13:08:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fldYj-0006lh-Mb for qemu-devel@nongnu.org; Fri, 03 Aug 2018 13:08:14 -0400 Date: Fri, 3 Aug 2018 18:08:04 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20180803170804.GE2802@work-vm> References: <20180803163646.31068-1-peter.maydell@linaro.org> <20180803163646.31068-3-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180803163646.31068-3-peter.maydell@linaro.org> Subject: Re: [Qemu-devel] [PATCH 2/3] hw/intc/arm_gicv3_common: Combine duplicate .subsections in vmstate_gicv3_cpu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, patches@linaro.org, Juan Quintela * 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 Reviewed-by: Dr. David Alan Gilbert > --- > Not strictly a 2.12 regression. > --- > hw/intc/arm_gicv3_common.c | 3 --- > 1 file changed, 3 deletions(-) > > 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 > } > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK