From: Joelle van Dyne <j@getutm.app>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Joelle van Dyne <j@getutm.app>,
"open list:raw" <qemu-block@nongnu.org>,
Max Reitz <mreitz@redhat.com>
Subject: [PATCH RESEND v2 9/9] block: check availablity for preadv/pwritev on mac
Date: Sun, 18 Oct 2020 22:19:53 -0700 [thread overview]
Message-ID: <20201019051953.90107-10-j@getutm.app> (raw)
In-Reply-To: <20201019051953.90107-1-j@getutm.app>
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)
next prev parent reply other threads:[~2020-10-19 5:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 5:19 [PATCH RESEND v2 0/9] iOS and Apple Silicon host support Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 1/9] configure: option to disable host block devices Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 2/9] configure: cross-compiling without cross_prefix Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 3/9] qemu: add support for iOS host Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 4/9] coroutine: add libucontext as external library Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 5/9] tcg: add const hints for code pointers Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 6/9] tcg: implement mirror mapped JIT for iOS Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 7/9] tcg: mirror mapping RWX pages for iOS optional Joelle van Dyne
2020-10-19 5:19 ` [PATCH RESEND v2 8/9] tcg: support JIT on Apple Silicon Joelle van Dyne
2020-10-19 5:19 ` Joelle van Dyne [this message]
2020-10-19 5:42 ` [PATCH RESEND v2 0/9] iOS and Apple Silicon host support no-reply
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=20201019051953.90107-10-j@getutm.app \
--to=j@getutm.app \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).