Patchwork [03/12] hw/pl080: Use LOG_GUEST_ERROR and LOG_UNIMP

login
register
mail settings
Submitter Peter Maydell
Date Oct. 25, 2012, 12:57 p.m.
Message ID <1351169867-5466-4-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/194142/
State New
Headers show

Comments

Peter Maydell - Oct. 25, 2012, 12:57 p.m.
Use LOG_GUEST_ERROR and LOG_UNIMP in preference to hw_error().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/pl080.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
malc - Oct. 25, 2012, 1:19 p.m.
On Thu, 25 Oct 2012, Peter Maydell wrote:

> Use LOG_GUEST_ERROR and LOG_UNIMP in preference to hw_error().

It's weird that printing something + abort is replaced by just printing
a message and the commit message doesn't really reflect the fact.

[..snip..]
Peter Maydell - Oct. 25, 2012, 1:23 p.m.
On 25 October 2012 14:19, malc <av1474@comtv.ru> wrote:
> On Thu, 25 Oct 2012, Peter Maydell wrote:
>
>> Use LOG_GUEST_ERROR and LOG_UNIMP in preference to hw_error().
>
> It's weird that printing something + abort is replaced by just printing
> a message and the commit message doesn't really reflect the fact.

I assume that the reader knows that hw_error() is fatal;
the point of the series is that these shouldn't be fatal
errors...

-- PMM

Patch

diff --git a/hw/pl080.c b/hw/pl080.c
index 6abe528..26150af 100644
--- a/hw/pl080.c
+++ b/hw/pl080.c
@@ -281,7 +281,8 @@  static uint64_t pl080_read(void *opaque, hwaddr offset,
         return s->sync;
     default:
     bad_offset:
-        hw_error("pl080_read: Bad offset %x\n", (int)offset);
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "pl080_read: Bad offset %x\n", (int)offset);
         return 0;
     }
 }
@@ -327,12 +328,13 @@  static void pl080_write(void *opaque, hwaddr offset,
     case 10: /* SoftLBReq */
     case 11: /* SoftLSReq */
         /* ??? Implement these.  */
-        hw_error("pl080_write: Soft DMA not implemented\n");
+        qemu_log_mask(LOG_UNIMP, "pl080_write: Soft DMA not implemented\n");
         break;
     case 12: /* Configuration */
         s->conf = value;
         if (s->conf & (PL080_CONF_M1 | PL080_CONF_M1)) {
-            hw_error("pl080_write: Big-endian DMA not implemented\n");
+            qemu_log_mask(LOG_UNIMP,
+                          "pl080_write: Big-endian DMA not implemented\n");
         }
         pl080_run(s);
         break;
@@ -341,7 +343,8 @@  static void pl080_write(void *opaque, hwaddr offset,
         break;
     default:
     bad_offset:
-        hw_error("pl080_write: Bad offset %x\n", (int)offset);
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "pl080_write: Bad offset %x\n", (int)offset);
     }
     pl080_update(s);
 }