From patchwork Tue May 27 16:28:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31001 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 107EC2066E for ; Tue, 27 May 2014 16:36:26 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id va2sf47851458obc.9 for ; Tue, 27 May 2014 09:36:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=RiKvqCCcNFppMDM8wqTEZvfbkBnKBqcu5R+2fUVUAwo=; b=kx4hnIAxMFgngnD41RfGHat7IixeRbUP32SHOOmh4SeFLD6ai+MpxT0WCjIZLyoV+v koVUS0fjWtp88ZKGBDIWr6eDOqWSAU8MBVZN55Ke2obVjNDsgzutruCrCVtB6/mY7U/k ZrZ4nGZ9Vfp26KI4p8TCYDz1zJlj2cgFWYdEo9LIob8zI2WxPzKTEtGPRN9Mu8Nra92R FuwYHr5k5fB9CnE3GHHBBJOjZtBXS6RBikUzMD+xPQPwactJgzXXAc70CPJ8hpYRDorD /fQyXM4HRQjq9KtfB0T2Yh4BkQh1AeZMtUW7HP/D8V2MCndf5YsYmMFv/Kz76uFbJBlV h/lw== X-Gm-Message-State: ALoCoQnoHRfMa2HpQGm5ImxFMf6QkeUfp9gqB9wbzJGr7jelv1wL29083xu8TOQus3rI8NPDXnII X-Received: by 10.182.33.66 with SMTP id p2mr14016974obi.8.1401208586356; Tue, 27 May 2014 09:36:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.247 with SMTP id h110ls3274524qgf.44.gmail; Tue, 27 May 2014 09:36:26 -0700 (PDT) X-Received: by 10.58.195.202 with SMTP id ig10mr3608514vec.33.1401208586246; Tue, 27 May 2014 09:36:26 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id lt1si8503694vec.15.2014.05.27.09.36.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 09:36:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id im17so10994225vcb.10 for ; Tue, 27 May 2014 09:36:26 -0700 (PDT) X-Received: by 10.58.216.163 with SMTP id or3mr1915753vec.80.1401208586144; Tue, 27 May 2014 09:36:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp133287vcb; Tue, 27 May 2014 09:36:25 -0700 (PDT) X-Received: by 10.224.223.195 with SMTP id il3mr16065773qab.104.1401208585612; Tue, 27 May 2014 09:36:25 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s49si17659709qgs.97.2014.05.27.09.36.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 09:36:25 -0700 (PDT) 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; Received: from localhost ([::1]:36559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKMS-0006Pn-MR for patch@linaro.org; Tue, 27 May 2014 12:36:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF7-0003Dn-Jw for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF6-0002sD-N1 for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:49 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF6-0002lf-GX for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:48 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WpKEs-0005qe-TF; Tue, 27 May 2014 17:28:34 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:21 +0100 Message-Id: <1401208114-22404-14-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> References: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 13/26] target-arm: A64: Add ELR entries for EL2 and 3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Reviewed-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias Message-id: 1400980132-25949-11-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/cpu.h | 2 +- target-arm/machine.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index ba1d495..60414ac 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -162,7 +162,7 @@ typedef struct CPUARMState { uint32_t condexec_bits; /* IT bits. cpsr[15:10,26:25]. */ uint64_t daif; /* exception masks, in the bits they are in in PSTATE */ - uint64_t elr_el[2]; /* AArch64 exception link regs */ + uint64_t elr_el[4]; /* AArch64 exception link regs */ uint64_t sp_el[4]; /* AArch64 banked stack pointers */ /* System control coprocessor (cp15) */ diff --git a/target-arm/machine.c b/target-arm/machine.c index 7b18a90..233e70d 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -218,8 +218,8 @@ static int cpu_post_load(void *opaque, int version_id) const VMStateDescription vmstate_arm_cpu = { .name = "cpu", - .version_id = 18, - .minimum_version_id = 18, + .version_id = 19, + .minimum_version_id = 19, .pre_save = cpu_pre_save, .post_load = cpu_post_load, .fields = (VMStateField[]) { @@ -238,7 +238,7 @@ const VMStateDescription vmstate_arm_cpu = { VMSTATE_UINT32_ARRAY(env.banked_r14, ARMCPU, 6), VMSTATE_UINT32_ARRAY(env.usr_regs, ARMCPU, 5), VMSTATE_UINT32_ARRAY(env.fiq_regs, ARMCPU, 5), - VMSTATE_UINT64(env.elr_el[1], ARMCPU), + VMSTATE_UINT64_ARRAY(env.elr_el, ARMCPU, 4), VMSTATE_UINT64_ARRAY(env.sp_el, ARMCPU, 4), /* The length-check must come before the arrays to avoid * incoming data possibly overflowing the array.