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 10/10] block: check availablity for preadv/pwritev on mac
Date: Mon, 12 Oct 2020 16:29:39 -0700	[thread overview]
Message-ID: <20201012232939.48481-11-j@getutm.app> (raw)
In-Reply-To: <20201012232939.48481-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)



  parent reply	other threads:[~2020-10-13  1:06 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-12 23:29 [PATCH 00/10] iOS and Apple Silicon host support Joelle van Dyne
2020-10-12 23:29 ` [PATCH 01/10] configure: option to disable host block devices Joelle van Dyne
2020-10-12 23:29 ` [PATCH 02/10] configure: cross-compiling without cross_prefix Joelle van Dyne
2020-10-12 23:29 ` [PATCH 03/10] qemu: add support for iOS host Joelle van Dyne
2020-10-12 23:29 ` [PATCH 04/10] meson: option to build as shared library Joelle van Dyne
2020-10-13  7:51   ` Daniel P. Berrangé
2020-10-13 14:41     ` BALATON Zoltan via
2020-10-13 14:46       ` Daniel P. Berrangé
2020-10-13 15:16         ` Joelle van Dyne
2020-10-13 15:57           ` Daniel P. Berrangé
2020-10-13 16:40             ` BALATON Zoltan via
2020-10-14 16:09               ` Joelle van Dyne
2020-10-13 15:23         ` BALATON Zoltan via
2020-10-12 23:29 ` [PATCH 05/10] slirp: update for iOS resolv fix Joelle van Dyne
2020-10-13 13:32   ` Philippe Mathieu-Daudé
2020-10-13 14:38     ` Marc-André Lureau
2020-10-13 14:59       ` Philippe Mathieu-Daudé
2020-10-14 15:54         ` Joelle van Dyne
2020-10-12 23:29 ` [PATCH 06/10] coroutine: add libucontext as external library Joelle van Dyne
2020-10-13 13:31   ` Stefan Hajnoczi
2020-10-13 14:49     ` BALATON Zoltan via
2020-10-13 15:25       ` Joelle van Dyne
2020-10-13 16:18       ` Daniel P. Berrangé
2020-10-12 23:29 ` [PATCH 07/10] tcg: implement bulletproof JIT Joelle van Dyne
2020-10-13  8:22   ` Philippe Mathieu-Daudé
2020-10-13 14:58   ` BALATON Zoltan via
2020-10-14 16:03     ` Joelle van Dyne
2020-10-14 20:35       ` Richard Henderson
2020-10-14 20:54         ` BALATON Zoltan via
2020-10-14 21:40           ` Richard Henderson
2020-10-14 20:58         ` Joelle van Dyne
2020-10-14 21:08           ` BALATON Zoltan via
2020-10-14 21:49           ` Richard Henderson
2020-10-14 22:54             ` Joelle van Dyne
2020-10-12 23:29 ` [PATCH 08/10] tcg: mirror mapping RWX pages for iOS optional Joelle van Dyne
2020-10-13 13:52   ` Paolo Bonzini
2020-10-13 15:10     ` Joelle van Dyne
2020-10-12 23:29 ` [PATCH 09/10] tcg: support JIT on Apple Silicon Joelle van Dyne
2020-10-13 13:55   ` Paolo Bonzini
2020-10-13 14:09     ` Peter Maydell
2020-10-13 15:13       ` Joelle van Dyne
2020-10-12 23:29 ` Joelle van Dyne [this message]
2020-10-13  1:21 ` [PATCH 00/10] iOS and Apple Silicon host support no-reply
2020-10-13  2:12   ` Joelle van Dyne

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=20201012232939.48481-11-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).