summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Crosthwaite <crosthwaitepeter@gmail.com>2015-09-07 10:39:29 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-07 10:39:29 +0100
commitf128bf297ba100877313cb3e9c0da845da0bb58c (patch)
treeff1b61f1a40b6820b0c7d4b3b93f80c01d1e1642
parentc30e15658b1b3dc9c241a515322ca5dc6fa6b4fe (diff)
downloadfocaccia-qemu-f128bf297ba100877313cb3e9c0da845da0bb58c.tar.gz
focaccia-qemu-f128bf297ba100877313cb3e9c0da845da0bb58c.zip
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>
-rw-r--r--target-arm/cpu.c5
1 files changed, 1 insertions, 4 deletions
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: