From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPDkM-0004x3-U4 for qemu-devel@nongnu.org; Mon, 08 Apr 2013 11:12:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPDkC-0003M9-2T for qemu-devel@nongnu.org; Mon, 08 Apr 2013 11:12:38 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:33679 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPDkB-0003Ly-S2 for qemu-devel@nongnu.org; Mon, 08 Apr 2013 11:12:28 -0400 From: Peter Maydell Date: Mon, 8 Apr 2013 15:43:49 +0100 Message-Id: <1365432230-20028-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1365432230-20028-1-git-send-email-peter.maydell@linaro.org> References: <1365432230-20028-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 2/3] target-arm: Add some missing CPU state fields to VMState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , Juan Quintela , patches@linaro.org A number of CPU state fields were accidentally omitted from our migration state: some OMAP specific cp15 registers, and some related to state for load/store exclusive insns. Add them. Signed-off-by: Peter Maydell --- target-arm/machine.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/target-arm/machine.c b/target-arm/machine.c index 3c41f06..2dd48d7 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -116,9 +116,9 @@ static const VMStateInfo vmstate_cpsr = { const VMStateDescription vmstate_arm_cpu = { .name = "cpu", - .version_id = 10, - .minimum_version_id = 10, - .minimum_version_id_old = 10, + .version_id = 11, + .minimum_version_id = 11, + .minimum_version_id_old = 11, .fields = (VMStateField[]) { VMSTATE_UINT32_ARRAY(env.regs, ARMCPU, 16), { @@ -172,9 +172,16 @@ const VMStateDescription vmstate_arm_cpu = { VMSTATE_UINT32(env.cp15.c13_tls2, ARMCPU), VMSTATE_UINT32(env.cp15.c13_tls3, ARMCPU), VMSTATE_UINT32(env.cp15.c15_cpar, ARMCPU), + VMSTATE_UINT32(env.cp15.c15_ticonfig, ARMCPU), + VMSTATE_UINT32(env.cp15.c15_i_max, ARMCPU), + VMSTATE_UINT32(env.cp15.c15_i_min, ARMCPU), + VMSTATE_UINT32(env.cp15.c15_threadid, ARMCPU), VMSTATE_UINT32(env.cp15.c15_power_control, ARMCPU), VMSTATE_UINT32(env.cp15.c15_diagnostic, ARMCPU), VMSTATE_UINT32(env.cp15.c15_power_diagnostic, ARMCPU), + VMSTATE_UINT32(env.exclusive_addr, ARMCPU), + VMSTATE_UINT32(env.exclusive_val, ARMCPU), + VMSTATE_UINT32(env.exclusive_high, ARMCPU), VMSTATE_UINT64(env.features, ARMCPU), VMSTATE_END_OF_LIST() }, -- 1.7.9.5