On 2/26/22 08:07, Peter Maydell wrote:
We implement qemu_memalign() in both oslib-posix.c and oslib-win32.c,
but the two versions are essentially the same: they call
qemu_try_memalign(), and abort() after printing an error message if
it fails. The only difference is that the win32 version prints the
GetLastError() value whereas the POSIX version prints
strerror(errno). However, this is a bug in the win32 version: in
commit dfbd0b873a85021 in 2020 we changed the implementation of
qemu_try_memalign() from using VirtualAlloc() (which sets the
GetLastError() value) to using _aligned_malloc() (which sets errno),
but didn't update the error message to match.
Replace the two separate functions with a single version in a
new memalign.c file, which drops the unnecessary extra qemu_oom_check()
function and instead prints a more useful message including the
requested size and alignment as well as the errno string.
Signed-off-by: Peter Maydell<peter.mayd...@linaro.org>
---
util/memalign.c | 39 +++++++++++++++++++++++++++++++++++++++
util/oslib-posix.c | 14 --------------
util/oslib-win32.c | 14 --------------
util/meson.build | 1 +
4 files changed, 40 insertions(+), 28 deletions(-)
create mode 100644 util/memalign.c
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
r~
