Patchwork [7/8] ppce500_spin: Replace assert by hw_error (fixes compiler warning)

login
register
mail settings
Submitter Alexander Graf
Date May 1, 2012, 7:50 p.m.
Message ID <1335901857-29799-8-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/156212/
State New
Headers show

Comments

Alexander Graf - May 1, 2012, 7:50 p.m.
From: Stefan Weil <sw@weilnetz.de>

The default case in function spin_read should never be reached,
therefore the old code used assert(0) to abort QEMU.

This does not work when QEMU is compiled with macro NDEBUG defined.
In this case (and also when the compiler does not know that assert
never returns), there is a compiler warning because of the missing
return value.

Using hw_error allows an improved error message and aborts always.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
[agraf: use __func__]
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/ppce500_spin.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index 95a2825..fddf219 100644
--- a/hw/ppce500_spin.c
+++ b/hw/ppce500_spin.c
@@ -179,7 +179,7 @@  static uint64_t spin_read(void *opaque, target_phys_addr_t addr, unsigned len)
     case 4:
         return ldl_p(spin_p);
     default:
-        assert(0);
+        hw_error("ppce500: unexpected %s with len = %u", __func__, len);
     }
 }