[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] util: Put qemu_vfree() in memalign.c
From: |
Peter Maydell |
Subject: |
[PATCH 8/9] util: Put qemu_vfree() in memalign.c |
Date: |
Sat, 26 Feb 2022 18:07:22 +0000 |
qemu_vfree() is the companion free function to qemu_memalign(); put
it in memalign.c so the allocation and free functions are together.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
util/memalign.c | 11 +++++++++++
util/oslib-posix.c | 6 ------
util/oslib-win32.c | 6 ------
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/util/memalign.c b/util/memalign.c
index fc8228bffb5..db6cdb095f9 100644
--- a/util/memalign.c
+++ b/util/memalign.c
@@ -74,3 +74,14 @@ void *qemu_memalign(size_t alignment, size_t size)
size, alignment, strerror(errno));
abort();
}
+
+void qemu_vfree(void *ptr)
+{
+ trace_qemu_vfree(ptr);
+#if !defined(CONFIG_POSIX_MEMALIGN) && defined(CONFIG_ALIGNED_MALLOC)
+ /* Only Windows _aligned_malloc needs a special free function */
+ _aligned_free(ptr);
+#else
+ free(ptr);
+#endif
+}
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 91798f7e504..2ebfb750578 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -220,12 +220,6 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t
*alignment, bool shared,
return ptr;
}
-void qemu_vfree(void *ptr)
-{
- trace_qemu_vfree(ptr);
- free(ptr);
-}
-
void qemu_anon_ram_free(void *ptr, size_t size)
{
trace_qemu_anon_ram_free(ptr, size);
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index d9768532bec..4b1ce0be4b0 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -75,12 +75,6 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool
shared,
return ptr;
}
-void qemu_vfree(void *ptr)
-{
- trace_qemu_vfree(ptr);
- _aligned_free(ptr);
-}
-
void qemu_anon_ram_free(void *ptr, size_t size)
{
trace_qemu_anon_ram_free(ptr, size);
--
2.25.1
- Re: [PATCH 1/9] hw/usb/redirect.c: Stop using qemu_oom_check(), (continued)
- [PATCH 3/9] util: Unify implementations of qemu_memalign(), Peter Maydell, 2022/02/26
- [PATCH 8/9] util: Put qemu_vfree() in memalign.c,
Peter Maydell <=
- [PATCH 7/9] util: Use meson checks for valloc() and memalign() presence, Peter Maydell, 2022/02/26
- [PATCH 6/9] util: Share qemu_try_memalign() implementation between POSIX and Windows, Peter Maydell, 2022/02/26
- [PATCH 9/9] osdep: Move memalign-related functions to their own header, Peter Maydell, 2022/02/26