From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Stefan Weil" <sw@weilnetz.de>
Subject: [PATCH v4 2/2] util/oslib: Assert qemu_try_memalign() alignment is a power of 2
Date: Tue, 20 Oct 2020 13:17:43 +0200 [thread overview]
Message-ID: <20201020111743.2074694-3-philmd@redhat.com> (raw)
In-Reply-To: <20201020111743.2074694-1-philmd@redhat.com>
qemu_try_memalign() expects a power of 2 alignment:
- posix_memalign(3):
The address of the allocated memory will be a multiple of alignment,
which must be a power of two and a multiple of sizeof(void *).
- _aligned_malloc()
The alignment value, which must be an integer power of 2.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
util/oslib-posix.c | 3 +++
util/oslib-win32.c | 1 +
2 files changed, 4 insertions(+)
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index f15234b5c03..9d6451f9239 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -200,6 +200,9 @@ void *qemu_try_memalign(size_t alignment, size_t size)
if (alignment < sizeof(void*)) {
alignment = sizeof(void*);
+ } else {
+ g_assert(QEMU_IS_ALIGNED(alignment, sizeof(void *)));
+ g_assert(is_power_of_2(alignment));
}
#if defined(CONFIG_POSIX_MEMALIGN)
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 29dd05d59d7..72e4ee910ce 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -58,6 +58,7 @@ void *qemu_try_memalign(size_t alignment, size_t size)
void *ptr;
g_assert(size != 0);
+ g_assert(is_power_of_2(alignment));
ptr = _aligned_malloc(alignment, size);
trace_qemu_memalign(alignment, size, ptr);
return ptr;
--
2.26.2
next prev parent reply other threads:[~2020-10-20 11:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 11:17 [PATCH v4 0/2] util/oslib: qemu_try_memalign() improvements Philippe Mathieu-Daudé
2020-10-20 11:17 ` [PATCH v4 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Philippe Mathieu-Daudé
2020-10-20 11:19 ` Philippe Mathieu-Daudé
2020-10-20 11:17 ` Philippe Mathieu-Daudé [this message]
2020-10-21 16:01 ` [PATCH v4 2/2] util/oslib: Assert qemu_try_memalign() alignment is a power of 2 Richard Henderson
2020-10-21 16:21 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201020111743.2074694-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).