[prev in list] [next in list] [prev in thread] [next in thread] 

List:       qemu-ppc
Subject:    Re: [Qemu-ppc] [PATCH v2] pc-dimm: fix error messages if no slots were defined
From:       Thomas Huth <thuth () redhat ! com>
Date:       2018-04-27 16:25:21
Message-ID: 1ecc2dc7-be06-c680-5f97-df0c8d6d4be0 () redhat ! com
[Download RAW message or body]

On 27.04.2018 14:05, David Hildenbrand wrote:
> If no slots were defined we try to allocate an empty bitmap, which
> fails.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> 
> v1 -> v2: more detailed error message
> 
>  hw/mem/pc-dimm.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 0119c68e01..12da89d562 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -118,9 +118,16 @@ static int pc_dimm_slot2bitmap(Object *obj, void *opaque)
>  
>  int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp)
>  {
> -    unsigned long *bitmap = bitmap_new(max_slots);
> +    unsigned long *bitmap;
>      int slot = 0;
>  
> +    if (max_slots <= 0) {
> +        error_setg(errp, "no slots where allocated, please specify "
> +                   "the 'slots' option");
> +        return slot;

In case you respin, I'd maybe rather return -1 here.

But since this is not used by the caller anyway in case of errors:

Reviewed-by: Thomas Huth <thuth@redhat.com>


[prev in list] [next in list] [prev in thread] [next in thread]