Re: [Qemu-devel] [PATCH] ppce500_spin: Replace assert by hw_error (fixes compiler warning)
Am 30.04.2012 10:54, schrieb Alexander Graf:
>
> On 28.04.2012, at 17:52, Stefan Weil wrote:
>
>> 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
>
> Thanks, applied to ppc-next. The patch didn't show up on patchworks btw, not
> sure what went wrong there.
Please consider fixing up on your branch as follows:
diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index 8522c41..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:
-hw_error("ppce500: unexpected spin_read with len = %u", len);
+hw_error("ppce500: unexpected %s with len = %u", __func__, len);
}
}
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH] ppce500_spin: Replace assert by hw_error (fixes compiler warning)
Am 30.04.2012 10:54, schrieb Alexander Graf: On 28.04.2012, at 17:52, Stefan Weil wrote: 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 Thanks, applied to ppc-next. The patch didn't show up on patchworks btw, not sure what went wrong there. Alex http://patchwork.ozlabs.org/patch/155666/ Did you filter on state "new"? I update the state for my patches. Are you planning to send a pull request for QEMU 1.1? I'd like to have this compiler warning fixed in the new version. Regards, Stefan
Re: [Qemu-devel] [PATCH] ppce500_spin: Replace assert by hw_error (fixes compiler warning)
On 28.04.2012, at 17:52, Stefan Weil wrote: > 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 Thanks, applied to ppc-next. The patch didn't show up on patchworks btw, not sure what went wrong there. Alex
Re: [Qemu-devel] [PATCH] ppce500_spin: Replace assert by hw_error (fixes compiler warning)
Am 28.04.2012 17:52, schrieb Stefan Weil:
> 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
> ---
> hw/ppce500_spin.c |2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
> index 960b7b0..57dc995 100644
> --- a/hw/ppce500_spin.c
> +++ b/hw/ppce500_spin.c
> @@ -178,7 +178,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 spin_read with len = %u", len);
Thanks. Bonus points for using __func__. :)
Andreas
> }
> }
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
