aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2020-10-21 19:38:02 +0200
committerRichard Henderson <richard.henderson@linaro.org>2021-01-07 05:09:06 -1000
commitdfbd0b873a85021c083d9b4b84630c3732645963 (patch)
tree99f9826ae15c0d8e1effaf57ec78849a20616391 /util
parent07ce0b05300de5bc8f1932a4cfbe38f3323e5ab1 (diff)
downloadqemu-dfbd0b873a85021c083d9b4b84630c3732645963.zip
qemu-dfbd0b873a85021c083d9b4b84630c3732645963.tar.gz
qemu-dfbd0b873a85021c083d9b4b84630c3732645963.tar.bz2
util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
We do not need or want to be allocating page sized quanta. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Stefan Weil <sw@weilnetz.de> Message-Id: <20201018164836.1149452-1-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'util')
-rw-r--r--util/oslib-win32.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 01787df..8adc651 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -39,6 +39,7 @@
#include "trace.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
+#include <malloc.h>
/* this must come after including "trace.h" */
#include <shlobj.h>
@@ -56,10 +57,8 @@ void *qemu_try_memalign(size_t alignment, size_t size)
{
void *ptr;
- if (!size) {
- abort();
- }
- ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
+ g_assert(size != 0);
+ ptr = _aligned_malloc(alignment, size);
trace_qemu_memalign(alignment, size, ptr);
return ptr;
}
@@ -93,9 +92,7 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared)
void qemu_vfree(void *ptr)
{
trace_qemu_vfree(ptr);
- if (ptr) {
- VirtualFree(ptr, 0, MEM_RELEASE);
- }
+ _aligned_free(ptr);
}
void qemu_anon_ram_free(void *ptr, size_t size)