From: Peter Crosthwaite <crosthwaitepeter@gmail.com>
Date: Mon, 7 Sep 2015 09:39:29 +0000 (+0100)
Subject: arm: cpu: assert() on no-EL2 virt IRQ error condition.
X-Git-Tag: v2.5.0-rc0~153^2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f128bf297ba100877313cb3e9c0da845da0bb58c;p=users%2Fdwmw2%2Fqemu.git

arm: cpu: assert() on no-EL2 virt IRQ error condition.

Replace the hw_error() for no-EL2 VIRQ with an assert.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 93b6acdee6cafe8ff0422a294a5640c3d35f0e17.1440842587.git.crosthwaite.peter@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index cc6c6f3d4c..4ba5929018 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: