From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4ADC-00064Q-Ga for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:16:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4AD6-0005vp-4w for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:15:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57066) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4AD5-0005vi-Sv for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:15:48 -0500 From: Kevin Wolf Date: Fri, 17 Jan 2014 15:14:54 +0100 Message-Id: <1389968119-24771-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1389968119-24771-1-git-send-email-kwolf@redhat.com> References: <1389968119-24771-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v3 04/29] qemu_memalign: Allow small alignments List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pl@kamp.de, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, xiawenc@linux.vnet.ibm.com 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 Reviewed-by: Wenchao Xia Reviewed-by: Max Reitz --- util/oslib-posix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index e00a44c..54f8932 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -85,6 +85,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); -- 1.8.1.4