Message ID | 20180215183700.26101-17-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 478257709a052f94bbe504ef295c876bbec174a7 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2065368ljc; Thu, 15 Feb 2018 10:49:55 -0800 (PST) X-Google-Smtp-Source: AH8x227VO6H3BLqbCKDtrNyGOI7vWSyiiTzpuvTcFF9qYe3BPJ6Tjb3Vdw/+eGtYU50KE1D4++/i X-Received: by 10.37.126.197 with SMTP id z188mr2726994ybc.496.1518720594917; Thu, 15 Feb 2018 10:49:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518720594; cv=none; d=google.com; s=arc-20160816; b=ET3R2g1unCldx5PThIiSeQKsqb/Sr45RyYotcfYUd0c1cJFJiJKFcwLP50WeAQQ89l Rnori9/bhIwbsPcBcH1Fj7Hvlr0q3JMDRL2JfAdeVBlRt5/w/Iqu9ukdQFgHkZFzzvwA Yao5wqDrA11Oe/P0oMW7vZ9ppMndRCuVrEoniTF/BlmW+q0gGwXYdZ4OyyrxYvDcG7u2 GW7DdBC7HUeRCgmgoDx2EV1EQ4E3c3CxjIIkVcS8W7NbOZGTRmaEAX5mp1obvxxMUkTZ /QLqCzUf24QPRiYRPiZscUqlYY74xB+GNArdSfzqxn8DuW3r3yDDRdiqpA37DUGBVXi+ WQ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=x8b91L2r0cf9ryuNfQp6QLNXOLMpMmn+vj3XsqjQaoA=; b=IONCo+2+xx/hRdninhnZPFGHJwXrNTcEb7FgwpsaDB21VFKfektVqM6JkVzvGIWL15 NYz7BMFuwJaNkuc3PJrKXOEZ5cymZQDPA67UZtmeKE3pwUT1o2iTfsTdqkrz4jKlN3sa xT2gHOmdTqIuPAa3sneUcGgrUPowmqQ8Pc2EqWMkld5Us+NRLWdK8PMXKASop86Ac2VJ 93PlmVN4OXv7gSBh+gxVc/sgLonKjf98Tb3cjCl/SxDHFysZsQVZkyR9ffwga3wjVeUu /m/lHAbqf2r4cWaYECJoR999k3dH1m7l17eHp3zLTocmMN7YDXBKZDKKMYJbVsW0QKLF vr5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s79si2451290ybs.550.2018.02.15.10.49.54 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 15 Feb 2018 10:49:54 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1emObS-0001ci-9p for patch@linaro.org; Thu, 15 Feb 2018 13:49:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1emOPC-0006Gl-Ve for qemu-devel@nongnu.org; Thu, 15 Feb 2018 13:37:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1emOPC-0004J0-BX for qemu-devel@nongnu.org; Thu, 15 Feb 2018 13:37:15 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46448) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1emOPB-0004I6-P0 for qemu-devel@nongnu.org; Thu, 15 Feb 2018 13:37:14 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1emOPA-00027l-Qx for qemu-devel@nongnu.org; Thu, 15 Feb 2018 18:37:12 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 18:36:56 +0000 Message-Id: <20180215183700.26101-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215183700.26101-1-peter.maydell@linaro.org> References: <20180215183700.26101-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 16/20] target/arm: Add AIRCR to vmstate struct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/machine.c b/target/arm/machine.c index 30fb1454a6..25cdf4d581 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -423,6 +423,10 @@ static const VMStateDescription vmstate_m_security = { VMSTATE_VALIDATE("SAU_RNR is valid", sau_rnr_vmstate_validate), VMSTATE_UINT32(env.sau.ctrl, ARMCPU), VMSTATE_UINT32(env.v7m.scr[M_REG_S], ARMCPU), + /* AIRCR is not secure-only, but our implementation is R/O if the + * security extension is unimplemented, so we migrate it here. + */ + VMSTATE_UINT32(env.v7m.aircr, ARMCPU), VMSTATE_END_OF_LIST() } };