From patchwork Mon Apr 8 14:43:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15978 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2E9CC23900 for ; Mon, 8 Apr 2013 14:44:26 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id m1sf9800531ves.11 for ; Mon, 08 Apr 2013 07:44:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=BEmM2t0OawbNRbiS+8tSacF9Tky0SlRjSBoTxnyHEBQ=; b=WFFE+RuSc4SBj1pIHYMBGd0KcGcarAHcqVSNwaYwNERDbslktzXBJvZqYTY0xOMnIs d+JgStPvNM2euSlJh/+uZpsSxBNfdrSBpt5psGAEzKMl4ahw/ZdTXUC8jD+9MZ7s/KB3 9suVKqMpVn6EPFseGkeEHNN+jWGUWsrgOEH2rm9yhGpY+Alje22P/VtqCNlxf9TU74eq qv1+JBEh8hMV4PMmLWopRbiLHWgiNdt5C0TbLmLCXvF/9YRA/2u9X3sZIqs6jp0YYzqf 5GOlLOMpwKWlD+jrcxk5PQv2LzsMrIadKl/DCPr3BVG+YHlVIGUcPK2cuGe3IAJhmQYa 1Z2w== X-Received: by 10.236.170.135 with SMTP id p7mr10045398yhl.21.1365432251457; Mon, 08 Apr 2013 07:44:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.117.36 with SMTP id kb4ls890775qeb.65.gmail; Mon, 08 Apr 2013 07:44:11 -0700 (PDT) X-Received: by 10.52.100.5 with SMTP id eu5mr13589605vdb.66.1365432251292; Mon, 08 Apr 2013 07:44:11 -0700 (PDT) Received: from mail-vb0-x235.google.com (mail-vb0-x235.google.com [2607:f8b0:400c:c02::235]) by mx.google.com with ESMTPS id ij9si8124718vdb.108.2013.04.08.07.44.11 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 07:44:11 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::235; Received: by mail-vb0-f53.google.com with SMTP id i3so3770559vbh.26 for ; Mon, 08 Apr 2013 07:44:11 -0700 (PDT) X-Received: by 10.52.245.6 with SMTP id xk6mr6323087vdc.114.1365432251136; Mon, 08 Apr 2013 07:44:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.85.136 with SMTP id h8csp21869vez; Mon, 8 Apr 2013 07:44:09 -0700 (PDT) X-Received: by 10.14.179.201 with SMTP id h49mr49282292eem.26.1365432234585; Mon, 08 Apr 2013 07:43:54 -0700 (PDT) Received: from mnementh.archaic.org.uk (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]) by mx.google.com with ESMTPS id b4si31265728eep.32.2013.04.08.07.43.53 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 08 Apr 2013 07:43:54 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UPDIV-0005DX-1q; Mon, 08 Apr 2013 15:43:51 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , Anthony Liguori , Juan Quintela Subject: [PATCH 2/3] target-arm: Add some missing CPU state fields to VMState Date: Mon, 8 Apr 2013 15:43:49 +0100 Message-Id: <1365432230-20028-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1365432230-20028-1-git-send-email-peter.maydell@linaro.org> References: <1365432230-20028-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQl5jueYnOAauiwgdbp1IQGIdwtmS2lAPU9BmYwf0GEShNQVLhHdqFYvOOXsb7ZiQvhH9OZt X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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() },