]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
qemu_memalign: Allow small alignments
authorKevin Wolf <kwolf@redhat.com>
Fri, 29 Nov 2013 20:29:17 +0000 (21:29 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 24 Jan 2014 16:40:01 +0000 (17:40 +0100)
The functions used by qemu_memalign() require an alignment that is at
least sizeof(void*). Adjust it if it is too small.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: BenoƮt Canet <benoit@irqsave.net>
util/oslib-posix.c

index f5c401646f0e70f5e70b46e22e86b5fa1bb60763..d5dca4729a6590d5acc659d68f859c7c1c954fbd 100644 (file)
@@ -88,6 +88,11 @@ void *qemu_oom_check(void *ptr)
 void *qemu_memalign(size_t alignment, size_t size)
 {
     void *ptr;
+
+    if (alignment < sizeof(void*)) {
+        alignment = sizeof(void*);
+    }
+
 #if defined(_POSIX_C_SOURCE) && !defined(__sun__)
     int ret;
     ret = posix_memalign(&ptr, alignment, size);