OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/oslib-win32: Fix fatal assertion in qemu_try_memalign

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

Fixes: ed6f53f9ca
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>
This commit is contained in:
Stefan Weil 2021-06-11 12:58:46 +02:00 committed by Richard Henderson
parent 9ca0362298
commit 1c9638667b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/oslib-win32.c
View File

@ -58,7 +58,11 @@ void *qemu_try_memalign(size_t alignment, size_t size)
void *ptr; void *ptr;
g_assert(size != 0); 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); ptr = _aligned_malloc(size, alignment);
trace_qemu_memalign(alignment, size, ptr); trace_qemu_memalign(alignment, size, ptr);
return ptr; return ptr;