From patchwork Fri Sep 4 15:05:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 53112 Return-Path: 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 3815822E23 for ; Fri, 4 Sep 2015 15:15:46 +0000 (UTC) Received: by lamp12 with SMTP id p12sf8059825lam.2 for ; Fri, 04 Sep 2015 08:15:45 -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=5IvU1S/aD15VnLeFT3keh6q4dDYg2GuwUmPY0A/1P6Q=; b=DKjoaF+m4w+KRjxBm7zoJ3O+OL4ecppj7M0fJnVEuFkbxsQRqs+2n08Q7IMNiqFggs Rg0IcGTSxvf8/Jujb4Y47WQ9KDfVgGkdcCHVmHtttDIKdLeauHgxeFEjro3RG+Y1lU04 m9t/c91BFdO4wIZcmkLeLBltAfwk9FzCYOtPQcL/lrl/OJ0pyUxnTTIv3lKqkmzZyOlN 0ATnCNT7VnECAPuyaoHbc34h+kySUklUjqXadhE4ADxQLGg7bCtt0xvMrUqbuzAdNgzf Wqw4Lnxye+mHiJaUAi17oRDqH99rjboxL2uTvw2kmXZ3lEWp6/VWK1+f7/xfvuiV+lRY C4gA== X-Gm-Message-State: ALoCoQm3Eclalli/k3rY3NSdJQHC3kK8RCOC/Lk+0lsIGwZiTIffmxEd7vyb3LuNXVxF8y3gbpV7 X-Received: by 10.152.29.36 with SMTP id g4mr1191933lah.3.1441379745262; Fri, 04 Sep 2015 08:15:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.200 with SMTP id la8ls91619lac.96.gmail; Fri, 04 Sep 2015 08:15:45 -0700 (PDT) X-Received: by 10.112.133.100 with SMTP id pb4mr4173659lbb.5.1441379745113; Fri, 04 Sep 2015 08:15:45 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id x3si2576344lae.20.2015.09.04.08.15.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2015 08:15:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbbmp1 with SMTP id mp1so13148929lbb.1 for ; Fri, 04 Sep 2015 08:15:45 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr4041486lbc.41.1441379744978; Fri, 04 Sep 2015 08:15:44 -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.164.42 with SMTP id yn10csp2050691lbb; Fri, 4 Sep 2015 08:15:44 -0700 (PDT) X-Received: by 10.55.221.199 with SMTP id u68mr5721116qku.83.1441379743415; Fri, 04 Sep 2015 08:15:43 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 20si3136037qgh.33.2015.09.04.08.15.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 04 Sep 2015 08:15:43 -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]:60619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXsiM-0000b9-1c for patch@linaro.org; Fri, 04 Sep 2015 11:15:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXsZ8-0008Se-G1 for qemu-devel@nongnu.org; Fri, 04 Sep 2015 11:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXsZ7-0000pm-7r for qemu-devel@nongnu.org; Fri, 04 Sep 2015 11:06:10 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:35023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXsZ7-0000iE-07 for qemu-devel@nongnu.org; Fri, 04 Sep 2015 11:06:09 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZXsYu-0006FQ-Ma for qemu-devel@nongnu.org; Fri, 04 Sep 2015 16:05:56 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 4 Sep 2015 16:05:42 +0100 Message-Id: <1441379156-23939-14-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1441379156-23939-1-git-send-email-peter.maydell@linaro.org> References: <1441379156-23939-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/27] arm: cpu: assert() on no-EL2 virt IRQ error condition. 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.217.175 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 From: Peter Crosthwaite Replace the hw_error() for no-EL2 VIRQ with an assert. Signed-off-by: Peter Crosthwaite Message-id: 93b6acdee6cafe8ff0422a294a5640c3d35f0e17.1440842587.git.crosthwaite.peter@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target-arm/cpu.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index cc6c6f3..4ba5929 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -331,10 +331,7 @@ static void arm_cpu_set_irq(void *opaque, int irq, int level) switch (irq) { case ARM_CPU_VIRQ: case ARM_CPU_VFIQ: - if (!arm_feature(env, ARM_FEATURE_EL2)) { - hw_error("%s: Virtual interrupt line %d with no EL2 support\n", - __func__, irq); - } + assert(arm_feature(env, ARM_FEATURE_EL2)); /* fall through */ case ARM_CPU_IRQ: case ARM_CPU_FIQ: