From patchwork Tue May 27 16:28:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 30990 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 68EB22066E for ; Tue, 27 May 2014 16:29:49 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id y20sf50311737ier.3 for ; Tue, 27 May 2014 09:29:49 -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=8/ii1YuuKlqq1sC0Cd6rqB2NApKhTPYxWVE/zX9IwIA=; b=ZSvqPEgHa/k2/nNthE2d1gPIOyrZy8VdiamqoVoFd6wTzQBO4dZQnlZ/eoyvY826Rl I2u+jxbJn/PbJkxAiz3aNg0JGQD4ndB4/ge6w+80pyhzqfJ1yOc46Ch/8raCOSgbx3A0 exbZLCVt9G3TdAdthJvdaK8jXmLtk35VuRfv0r2FgSfh3KhWBvejeoD7U2BQd2urFNzb hYZLWFoFczW17rVeBUWBbb6UuMJKVbVISIFRk7VFttXa7NscyqQNPs6m+vv3DF3lqZDl t59bT0g5vCfl5Xy/jX4MC++m63XwXczFT0hTdSe+ccXuSLVpQ7mvbK3QJC+cxW2lQMM+ iG5A== X-Gm-Message-State: ALoCoQl+a3aAV0bRrLLnde0re10jm+KY2Swx1BdzwHaftZn+nIS6FIMmQWakRmliVMpgdIqLnTtR X-Received: by 10.182.133.73 with SMTP id pa9mr9661874obb.6.1401208188981; Tue, 27 May 2014 09:29:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.166 with SMTP id z35ls3357159qgz.93.gmail; Tue, 27 May 2014 09:29:48 -0700 (PDT) X-Received: by 10.52.35.69 with SMTP id f5mr1722144vdj.83.1401208188901; Tue, 27 May 2014 09:29:48 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id t15si8477531vew.65.2014.05.27.09.29.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 09:29:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id jz11so10881411veb.21 for ; Tue, 27 May 2014 09:29:48 -0700 (PDT) X-Received: by 10.53.13.133 with SMTP id ey5mr24048785vdd.8.1401208188838; Tue, 27 May 2014 09:29:48 -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 ib8csp132699vcb; Tue, 27 May 2014 09:29:48 -0700 (PDT) X-Received: by 10.140.24.98 with SMTP id 89mr41666655qgq.33.1401208187975; Tue, 27 May 2014 09:29:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b4si18141148qat.93.2014.05.27.09.29.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 09:29:47 -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]:36477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKG3-0004Ej-29 for patch@linaro.org; Tue, 27 May 2014 12:29:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF1-00035D-TH for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF0-0002nw-Aj for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:43 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF0-0002lf-3W for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:42 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WpKEs-0005qa-Ry; Tue, 27 May 2014 17:28:34 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:20 +0100 Message-Id: <1401208114-22404-13-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 12/26] target-arm: A64: Add SP 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.128.176 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-10-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 62d85ff..ba1d495 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -163,7 +163,7 @@ typedef struct CPUARMState { uint64_t daif; /* exception masks, in the bits they are in in PSTATE */ uint64_t elr_el[2]; /* AArch64 exception link regs */ - uint64_t sp_el[2]; /* AArch64 banked stack pointers */ + uint64_t sp_el[4]; /* AArch64 banked stack pointers */ /* System control coprocessor (cp15) */ struct { diff --git a/target-arm/machine.c b/target-arm/machine.c index b0fa46d..7b18a90 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 = 17, - .minimum_version_id = 17, + .version_id = 18, + .minimum_version_id = 18, .pre_save = cpu_pre_save, .post_load = cpu_post_load, .fields = (VMStateField[]) { @@ -239,7 +239,7 @@ const VMStateDescription vmstate_arm_cpu = { 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.sp_el, ARMCPU, 2), + VMSTATE_UINT64_ARRAY(env.sp_el, ARMCPU, 4), /* The length-check must come before the arrays to avoid * incoming data possibly overflowing the array. */