From: Stefan Weil <sw@weilnetz.de>
Date: Fri, 11 Jun 2021 10:58:46 +0000 (+0200)
Subject: util/oslib-win32: Fix fatal assertion in qemu_try_memalign
X-Git-Tag: v6.1.0-rc0~65^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c9638667b7068539dc5783c9428d588b14162ea;p=thirdparty%2Fqemu.git

util/oslib-win32: Fix fatal assertion in qemu_try_memalign

The function is called with alignment == 0 which caused an assertion.
Use the code from oslib-posix.c to fix that regression.

Fixes: ed6f53f9ca9
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210611105846.347954-1-sw@weilnetz.de>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index ee3a3692d82..af559ef3398 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -58,7 +58,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;