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é <[email protected]>
Reviewed-by: Stefan Weil <[email protected]>
Message-Id: <20201018164836.1149452[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Richard Henderson <[email protected]>

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 01787df74cb768a6d7d8eaf15eca02de96d35e38..8adc65125913713d6de540a8f5d6fdc45582aa37 100644 (file)
--- 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 "trace.h"
 #include "qemu/sockets.h"
 #include "qemu/cutils.h"

+#include <malloc.h>

 
 /* this must come after including "trace.h" */
 #include <shlobj.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;
 
 {
     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;
 }
     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);
 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)
 }
 
 void qemu_anon_ram_free(void *ptr, size_t size)