From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kVO-0004Ag-Rq for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:25:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6kVJ-0008OW-6G for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:25:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kVI-0008OM-VG for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:25:17 -0500 From: Kevin Wolf Date: Fri, 24 Jan 2014 18:21:51 +0100 Message-Id: <1390584136-24703-69-git-send-email-kwolf@redhat.com> In-Reply-To: <1390584136-24703-1-git-send-email-kwolf@redhat.com> References: <1390584136-24703-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 68/93] qemu_memalign: Allow small alignments List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 Reviewed-by: Beno=C3=AEt Canet --- util/oslib-posix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index f5c4016..d5dca47 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -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 =3D sizeof(void*); + } + #if defined(_POSIX_C_SOURCE) && !defined(__sun__) int ret; ret =3D posix_memalign(&ptr, alignment, size); --=20 1.8.1.4