From f128bf297ba100877313cb3e9c0da845da0bb58c Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Mon, 7 Sep 2015 10:39:29 +0100 Subject: [PATCH] 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 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 cc6c6f3d4..4ba592901 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: -- 2.39.5