| Message ID | 20210611105846.347954-1-sw@weilnetz.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | util/oslib-win32: Fix fatal assertion in qemu_try_memalign | expand |
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; >
Am 11.06.21 um 13:06 schrieb 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> Sure, that's fine for me, too. I think the text can be changed without a v2 of the patch. Stefan
> 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). > > Signed-off-by: Stefan Weil <sw@weilnetz.de> I'll queue this to tcg-next, as I'm about to do a PR for that. I'll add the Fixed: tag as suggested by Phil. r~
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;
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). Signed-off-by: Stefan Weil <sw@weilnetz.de> --- util/oslib-win32.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)