Message ID | 1441731092-6513-14-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | dbc29a868cf5b7e6fa7bb2e6c4f188b9470779c5 |
Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBBMGTXSXQKGQEGOHVYDA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id E430A22A09 for <linaro@patches.linaro.org>; Tue, 8 Sep 2015 18:32:17 +0000 (UTC) Received: by laeb10 with SMTP id b10sf43821856lae.1 for <linaro@patches.linaro.org>; Tue, 08 Sep 2015 11:32:16 -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: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=Hpmp2Zd4dgGK+CjJ0U7ppsu+dugC0/unxFviN1YJM3o=; b=EGDBHS2Bei8GnnqVJo3xWBU6f1ydiLmuxgULoEnrZF6QaqnZdIwFV7EjwFJGBpZGfX C1lkh32tzcD7MsRPJElBNNOXVVYdVaUovdVq1akp0vCFEm5Hpa8yliE7xV3AN5kcO65y x63QoetGXUsewf9zb67CBNcUEx6vviT9EdLM+VfGIZRLxeMPnhsBSyO+aINQeNHk3q9k puImbaXrWLR3kv4cVkZ3UkSUp15iLQHXwUUhCHItU0PrrHgWVqeZJUiH+Dz35v++gNYh 7PBFJzH2RK5e2QffVG0pDrzyzZmqjWUpRF2SSHIz5hTTUwkcpyCA3LwVlrJvitx8YIXw 8+9g== X-Gm-Message-State: ALoCoQnO7Fj7yekCFYg4l6kMxp37jZsju3q+k9WLbp3btb6gn2Hc92UxP88Gt3/xVJoMIpxUqPY7 X-Received: by 10.112.78.101 with SMTP id a5mr7188168lbx.9.1441737136558; Tue, 08 Sep 2015 11:32:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.243.39 with SMTP id wv7ls306338lac.85.gmail; Tue, 08 Sep 2015 11:32:16 -0700 (PDT) X-Received: by 10.112.147.135 with SMTP id tk7mr24785040lbb.100.1441737136404; Tue, 08 Sep 2015 11:32:16 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id e8si4091054laa.121.2015.09.08.11.32.16 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2015 11:32:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by laeb10 with SMTP id b10so76228084lae.1 for <patchwork-forward@linaro.org>; Tue, 08 Sep 2015 11:32:16 -0700 (PDT) X-Received: by 10.152.18.194 with SMTP id y2mr24676314lad.88.1441737136290; Tue, 08 Sep 2015 11:32:16 -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.112.59.35 with SMTP id w3csp1146381lbq; Tue, 8 Sep 2015 11:32:15 -0700 (PDT) X-Received: by 10.55.192.26 with SMTP id o26mr36711322qki.89.1441737135123; Tue, 08 Sep 2015 11:32:15 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m75si4846207qki.120.2015.09.08.11.32.14 for <patch@linaro.org> (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Sep 2015 11:32:15 -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]:35783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1ZZM8g-0003qD-3y for patch@linaro.org; Tue, 08 Sep 2015 12:52:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ZZM7V-0002TW-RA for qemu-devel@nongnu.org; Tue, 08 Sep 2015 12:51:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ZZM7U-0007sq-Cf for qemu-devel@nongnu.org; Tue, 08 Sep 2015 12:51:45 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:35049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ZZM7U-0007b2-5Q for qemu-devel@nongnu.org; Tue, 08 Sep 2015 12:51:44 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from <pm215@archaic.org.uk>) id 1ZZM7I-0001iM-N7 for qemu-devel@nongnu.org; Tue, 08 Sep 2015 17:51:32 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 8 Sep 2015 17:51:25 +0100 Message-Id: <1441731092-6513-14-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1441731092-6513-1-git-send-email-peter.maydell@linaro.org> References: <1441731092-6513-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 Subject: [Qemu-devel] [PULL 13/20] target-arm: Log the target EL when taking exceptions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> 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-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.215.49 as permitted sender) smtp.mailfrom=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 |
diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 02fc9b4..2c7a645 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -478,7 +478,8 @@ void aarch64_cpu_do_interrupt(CPUState *cs) } arm_log_exception(cs->exception_index); - qemu_log_mask(CPU_LOG_INT, "...from EL%d\n", arm_current_el(env)); + qemu_log_mask(CPU_LOG_INT, "...from EL%d to EL%d\n", arm_current_el(env), + new_el); if (qemu_loglevel_mask(CPU_LOG_INT) && !excp_is_internal(cs->exception_index)) { qemu_log_mask(CPU_LOG_INT, "...with ESR 0x%" PRIx32 "\n",