From patchwork Fri May 2 19:15:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 29577 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 20954203F3 for ; Fri, 2 May 2014 19:19:49 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id va2sf11394328obc.5 for ; Fri, 02 May 2014 12:19:48 -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=whnivSNBN3gwCru3I2KPvM802x5EowlTJqCwD8r/TVY=; b=KkKepJd3SYotBA4gaVf9XD/8S2qyWcl6MDB5o1QGmTH72n0YItYaycpTqD2KvyQSvv GEPMXCt5BVWcJk4oSs9uUiv57sl5KN5+MNpFv3aotdG9eCD0yTO0H7Po6f+qClm0pVVR c6QeE+DGEpbS48H5vGZf1D/t7SRi2oMWLhqCfuzT/GgnPyl4cRLhxmvfeRYlmzQw8bhq DOc0lZswue2OfPBBPilXRKdhtc5OsJujO2p4MaMA0kTO8txjqZ8A0o8aR3lv8TTIwrzB uYjvGTSPT3VJM5mo2xDd6kWlvS8ORpcNb3nHep57NtE+mChOSD/FS2jpfatm21w8Cvzm Q67Q== X-Gm-Message-State: ALoCoQlikJcgijZbHuZ0nhE1792bpxDRtugXQqI+plLrB4wbUH3jVqFspg8VWzMjNkNqEDGw16/6 X-Received: by 10.182.135.167 with SMTP id pt7mr2601846obb.14.1399058388671; Fri, 02 May 2014 12:19:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.72 with SMTP id s66ls1627730qgs.85.gmail; Fri, 02 May 2014 12:19:48 -0700 (PDT) X-Received: by 10.58.28.204 with SMTP id d12mr31012veh.81.1399058388492; Fri, 02 May 2014 12:19:48 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id dy7si6919469vec.126.2014.05.02.12.19.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 12:19:48 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id lf12so6038657vcb.27 for ; Fri, 02 May 2014 12:19:48 -0700 (PDT) X-Received: by 10.220.7.131 with SMTP id d3mr1008230vcd.45.1399058388419; Fri, 02 May 2014 12:19: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 ib8csp125953vcb; Fri, 2 May 2014 12:19:48 -0700 (PDT) X-Received: by 10.140.36.86 with SMTP id o80mr23318768qgo.25.1399058388067; Fri, 02 May 2014 12:19:48 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c4si14501387qad.141.2014.05.02.12.19.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 May 2014 12:19:48 -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]:45974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIzr-0004tK-Gi for patch@linaro.org; Fri, 02 May 2014 15:19:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIwE-00083Z-Kj for qemu-devel@nongnu.org; Fri, 02 May 2014 15:16:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgIw5-0000BE-CQ for qemu-devel@nongnu.org; Fri, 02 May 2014 15:16:02 -0400 Received: from afflict.kos.to ([92.243.29.197]:48076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIw5-00009e-3y for qemu-devel@nongnu.org; Fri, 02 May 2014 15:15:53 -0400 Received: from localhost.localdomain (afflict [92.243.29.197]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id DE816264CE; Fri, 2 May 2014 21:15:50 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 2 May 2014 22:15:42 +0300 Message-Id: <7af03928b1194befa1ad12e25b0e53e6770ba18c.1399057853.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 07/14] linux-user/signal.c: Set fault address in AArch64 signal info 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: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: Peter Maydell Set the fault address correctly in the signal information passed to a signal handler for AArch64 guests. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/signal.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 7d6246f..5b8a01f 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1242,8 +1242,7 @@ static int target_setup_sigframe(struct target_rt_sigframe *sf, __put_user(env->pc, &sf->uc.tuc_mcontext.pc); __put_user(pstate_read(env), &sf->uc.tuc_mcontext.pstate); - __put_user(/*current->thread.fault_address*/ 0, - &sf->uc.tuc_mcontext.fault_address); + __put_user(env->exception.vaddress, &sf->uc.tuc_mcontext.fault_address); for (i = 0; i < TARGET_NSIG_WORDS; i++) { __put_user(set->sig[i], &sf->uc.tuc_sigmask.sig[i]);