Re: [PATCH] util/oslib-win32: Fix fatal assertion in qemu_try_memalign

[Philippe Mathieu-Daudé]

On 6/11/21 12:58 PM, Stefan Weil wrote:
> The function is called with alignment == 0 which caused an assertion.
> Use the code from oslib_posix.c to fix that regression (introduced
> by commit ed6f53f9ca9).
> 

Oops.

Can we replace '(introduced by commit ed6f53f9ca9)' by:
Fixes: ed6f53f9ca9 ("util/oslib: Assert qemu_try_memalign() alignment is
a power of 2")

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  util/oslib-win32.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index ca99356fdf..7b318ea835 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -57,7 +57,11 @@ void *qemu_try_memalign(size_t alignment, size_t size)
>      void *ptr;
>  
>      g_assert(size != 0);
> -    g_assert(is_power_of_2(alignment));
> +    if (alignment < sizeof(void *)) {
> +        alignment = sizeof(void *);
> +    } else {
> +        g_assert(is_power_of_2(alignment));
> +    }
>      ptr = _aligned_malloc(size, alignment);
>      trace_qemu_memalign(alignment, size, ptr);
>      return ptr;
>