[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RESEND v2 9/9] block: check availablity for preadv/pwritev on mac
From: |
Joelle van Dyne |
Subject: |
[PATCH RESEND v2 9/9] block: check availablity for preadv/pwritev on mac |
Date: |
Sun, 18 Oct 2020 22:19:53 -0700 |
From: osy <osy86@users.noreply.github.com>
macOS 11/iOS 14 added preadv/pwritev APIs. Due to weak linking, configure
will succeed with CONFIG_PREADV even when targeting a lower OS version. We
therefore need to check at run time if we can actually use these APIs.
Signed-off-by: Joelle van Dyne <j@getutm.app>
---
block/file-posix.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/block/file-posix.c b/block/file-posix.c
index cdc73b5f1d..d7482036a3 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1393,12 +1393,24 @@ static bool preadv_present = true;
static ssize_t
qemu_preadv(int fd, const struct iovec *iov, int nr_iov, off_t offset)
{
+#ifdef CONFIG_DARWIN /* preadv introduced in macOS 11 */
+ if (!__builtin_available(macOS 11, iOS 14, watchOS 7, tvOS 14, *)) {
+ preadv_present = false;
+ return -ENOSYS;
+ } else
+#endif
return preadv(fd, iov, nr_iov, offset);
}
static ssize_t
qemu_pwritev(int fd, const struct iovec *iov, int nr_iov, off_t offset)
{
+#ifdef CONFIG_DARWIN /* pwritev introduced in macOS 11 */
+ if (!__builtin_available(macOS 11, iOS 14, watchOS 7, tvOS 14, *)) {
+ preadv_present = false;
+ return -ENOSYS;
+ } else
+#endif
return pwritev(fd, iov, nr_iov, offset);
}
--
2.24.3 (Apple Git-128)
- [PATCH RESEND v2 0/9] iOS and Apple Silicon host support, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 1/9] configure: option to disable host block devices, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 2/9] configure: cross-compiling without cross_prefix, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 3/9] qemu: add support for iOS host, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 4/9] coroutine: add libucontext as external library, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 8/9] tcg: support JIT on Apple Silicon, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 6/9] tcg: implement mirror mapped JIT for iOS, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 9/9] block: check availablity for preadv/pwritev on mac,
Joelle van Dyne <=
- [PATCH RESEND v2 7/9] tcg: mirror mapping RWX pages for iOS optional, Joelle van Dyne, 2020/10/19
- [PATCH RESEND v2 5/9] tcg: add const hints for code pointers, Joelle van Dyne, 2020/10/19
- Re: [PATCH RESEND v2 0/9] iOS and Apple Silicon host support, no-reply, 2020/10/19