[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/9] util: Make qemu_oom_check() a static function
From: |
Peter Maydell |
Subject: |
[PATCH v2 2/9] util: Make qemu_oom_check() a static function |
Date: |
Fri, 4 Mar 2022 11:21:19 +0000 |
The qemu_oom_check() function, which we define in both oslib-posix.c
and oslib-win32.c, is now used only locally in that file; make it
static.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20220226180723.1706285-3-peter.maydell@linaro.org
---
include/qemu-common.h | 2 --
util/oslib-posix.c | 2 +-
util/oslib-win32.c | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 68b2e3bc109..8c0d9ab0f77 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -26,8 +26,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-void *qemu_oom_check(void *ptr);
-
ssize_t qemu_write_full(int fd, const void *buf, size_t count)
QEMU_WARN_UNUSED_RESULT;
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index f2be7321c59..ed5974d3845 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -199,7 +199,7 @@ fail_close:
return false;
}
-void *qemu_oom_check(void *ptr)
+static void *qemu_oom_check(void *ptr)
{
if (ptr == NULL) {
fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno));
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index af559ef3398..c87e6977246 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -44,7 +44,7 @@
/* this must come after including "trace.h" */
#include <shlobj.h>
-void *qemu_oom_check(void *ptr)
+static void *qemu_oom_check(void *ptr)
{
if (ptr == NULL) {
fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError());
--
2.25.1
- [PATCH v2 0/9] Cleanup of qemu_oom_check() and qemu_memalign(), Peter Maydell, 2022/03/04
- [PATCH v2 1/9] hw/usb/redirect.c: Stop using qemu_oom_check(), Peter Maydell, 2022/03/04
- [PATCH v2 2/9] util: Make qemu_oom_check() a static function,
Peter Maydell <=
- [PATCH v2 3/9] util: Unify implementations of qemu_memalign(), Peter Maydell, 2022/03/04
- [PATCH v2 4/9] util: Return valid allocation for qemu_try_memalign() with zero size, Peter Maydell, 2022/03/04
- [PATCH v2 5/9] meson.build: Don't misdetect posix_memalign() on Windows, Peter Maydell, 2022/03/04
- [PATCH v2 6/9] util: Share qemu_try_memalign() implementation between POSIX and Windows, Peter Maydell, 2022/03/04