Imported Upstream version 2.2.0upstream/2.2.1upstream/2.2.0

1 files changed, 8 insertions, 3 deletions

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 507cedd84..87cfbe083 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -50,19 +50,24 @@ void *qemu_oom_check(void *ptr)
     return ptr;
 }
 
-void *qemu_memalign(size_t alignment, size_t size)
+void *qemu_try_memalign(size_t alignment, size_t size)
 {
     void *ptr;
 
     if (!size) {
         abort();
     }
-    ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));
+    ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
     trace_qemu_memalign(alignment, size, ptr);
     return ptr;
 }
 
-void *qemu_anon_ram_alloc(size_t size)
+void *qemu_memalign(size_t alignment, size_t size)
+{
+    return qemu_oom_check(qemu_try_memalign(alignment, size));
+}
+
+void *qemu_anon_ram_alloc(size_t size, uint64_t *align)
 {
     void *ptr;