qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v4 7/7] block: check availablity for preadv/pwritev on mac
Date: Sat,  7 Nov 2020 21:26:05 -0800	[thread overview]
Message-ID: <20201108052605.45840-8-j@getutm.app> (raw)
In-Reply-To: <20201108052605.45840-1-j@getutm.app>

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 5560fd20ac..b5a7ce483d 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1394,12 +1394,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.28.0



      parent reply	other threads:[~2020-11-08  5:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-08  5:25 [PATCH v4 0/7] iOS and Apple Silicon host support Joelle van Dyne
2020-11-08  5:25 ` [PATCH v4 1/7] configure: option to disable host block devices Joelle van Dyne
2020-11-08  5:26 ` [PATCH v4 2/7] configure: cross-compiling with empty cross_prefix Joelle van Dyne
2020-11-09 18:52   ` Thomas Huth
2020-11-08  5:26 ` [PATCH v4 3/7] qemu: add support for iOS host Joelle van Dyne
2020-11-08  5:26 ` [PATCH v4 4/7] coroutine: add libucontext as external library Joelle van Dyne
2020-11-08 15:46   ` Philippe Mathieu-Daudé
2020-11-08 22:51     ` Joelle van Dyne
2020-11-08  5:26 ` [PATCH v4 5/7] slirp: update build flags for iOS resolv fix Joelle van Dyne
2020-11-08  5:26 ` [PATCH v4 6/7] tcg: implement JIT for iOS and Apple Silicon Joelle van Dyne
2020-11-08  5:26 ` Joelle van Dyne [this message]

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=20201108052605.45840-8-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).