qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Crosthwaite <crosthwaitepeter@gmail.com>
To: qemu-devel@nongnu.org
Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org,
	Peter Crosthwaite <crosthwaite.peter@gmail.com>
Subject: [Qemu-devel] [PATCH 1/2] arm: cpu: Soften no-EL2 virt IRQ error condition.
Date: Fri, 17 Jul 2015 23:00:05 -0700	[thread overview]
Message-ID: <74a5ec02619e78867fa4052ae45f4183d9c1656b.1437197974.git.crosthwaite.peter@gmail.com> (raw)
In-Reply-To: <cover.1437197974.git.crosthwaite.peter@gmail.com>
In-Reply-To: <cover.1437197974.git.crosthwaite.peter@gmail.com>

Replace the hw_error for no-EL2 VIRQ with a LOG_UNIMP. This is more
accurate and handles the corner case where the user defeatures EL2
using overrides in a system that would otherwise have EL2
connectivity.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
I'm primarily interested in getting rid of the hw_error() more than
anything. If my use-case seems invalid and a stronger error is
preffered, it can be redone as an assert and the code will still work
for me.
---
 target-arm/cpu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 29b7eca..c4b8448 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -310,8 +310,10 @@ static void arm_cpu_set_irq(void *opaque, int irq, int level)
     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);
+            qemu_log_mask(LOG_UNIMP,
+                          "%s: Virtual interrupt line %d with no EL2 support\n",
+                          __func__, irq);
+            return;
         }
         /* fall through */
     case ARM_CPU_IRQ:
-- 
1.9.1

  reply	other threads:[~2015-07-18  6:00 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-18  6:00 [Qemu-devel] [PATCH 0/2] Remove hw_error from target-arm Peter Crosthwaite
2015-07-18  6:00 ` Peter Crosthwaite [this message]
2015-07-18  9:03   ` [Qemu-devel] [PATCH 1/2] arm: cpu: Soften no-EL2 virt IRQ error condition Peter Maydell
2015-07-18  6:00 ` [Qemu-devel] [PATCH 2/2] arm: Remove hw_error() usages Peter Crosthwaite
2015-07-18  9:07   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=74a5ec02619e78867fa4052ae45f4183d9c1656b.1437197974.git.crosthwaite.peter@gmail.com \
    --to=crosthwaitepeter@gmail.com \
    --cc=crosthwaite.peter@gmail.com \
    --cc=edgar.iglesias@xilinx.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).