All of lore.kernel.org
 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 v9 09/11] block: check availablity for preadv/pwritev on mac
Date: Mon, 25 Jan 2021 17:24:55 -0800	[thread overview]
Message-ID: <20210126012457.39046-10-j@getutm.app> (raw)
In-Reply-To: <20210126012457.39046-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 | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/block/file-posix.c b/block/file-posix.c
index 666d3e7504..6473f84db8 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1386,17 +1386,50 @@ static int handle_aiocb_flush(void *opaque)
 #ifdef CONFIG_PREADV
 
 static bool preadv_present = true;
+static bool preadv_checked;
 
 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 (unlikely(!preadv_checked)) {
+        if (__builtin_available(macOS 11, iOS 14, watchOS 7, tvOS 14, *)) {
+            preadv_checked = true;
+        } else {
+            preadv_present = false;
+            return -ENOSYS;
+        }
+    }
+    /* Now we suppress the availability warning since we use the cached check */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+    return preadv(fd, iov, nr_iov, offset);
+#pragma clang diagnostic pop
+#else /* CONFIG_DARWIN */
     return preadv(fd, iov, nr_iov, offset);
+#endif
 }
 
 static ssize_t
 qemu_pwritev(int fd, const struct iovec *iov, int nr_iov, off_t offset)
 {
+#ifdef CONFIG_DARWIN /* preadv introduced in macOS 11 */
+    if (unlikely(!preadv_checked)) {
+        if (__builtin_available(macOS 11, iOS 14, watchOS 7, tvOS 14, *)) {
+            preadv_checked = true;
+        } else {
+            preadv_present = false;
+            return -ENOSYS;
+        }
+    }
+    /* Now we suppress the availability warning since we use the cached check */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+    return pwritev(fd, iov, nr_iov, offset);
+#pragma clang diagnostic pop
+#else /* CONFIG_DARWIN */
     return pwritev(fd, iov, nr_iov, offset);
+#endif
 }
 
 #else
-- 
2.28.0



  parent reply	other threads:[~2021-01-26  1:37 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-26  1:24 [PATCH v9 00/11] iOS and Apple Silicon host support Joelle van Dyne
2021-01-26  1:24 ` [PATCH v9 01/11] block: feature detection for host block support Joelle van Dyne
2021-01-26  1:24 ` [PATCH v9 02/11] configure: cross-compiling with empty cross_prefix Joelle van Dyne
2021-01-26  1:24 ` [PATCH v9 03/11] configure: check for sys/disk.h Joelle van Dyne
2021-01-26  4:35   ` Warner Losh
2021-01-26  5:55     ` Joelle van Dyne
2021-01-26  7:08       ` Philippe Mathieu-Daudé
2021-01-26  7:14         ` Warner Losh
2021-01-26  7:18         ` Philippe Mathieu-Daudé
2021-01-26  7:09       ` Warner Losh
2021-01-26  1:24 ` [PATCH v9 04/11] slirp: feature detection for smbd Joelle van Dyne
2021-01-26  7:30   ` Philippe Mathieu-Daudé
2021-01-28 20:33     ` Joelle van Dyne
2021-01-26  1:24 ` [PATCH v9 05/11] osdep: build with non-working system() function Joelle van Dyne
2021-01-26  1:24 ` [PATCH v9 06/11] darwin: remove redundant dependency declaration Joelle van Dyne
2021-01-26  1:24 ` [PATCH v9 07/11] darwin: fix cross-compiling for Darwin Joelle van Dyne
2021-01-26  7:10   ` Philippe Mathieu-Daudé
2021-01-26  1:24 ` [PATCH v9 08/11] configure: cross compile should use x86_64 cpu_family Joelle van Dyne
2021-01-26  1:24 ` Joelle van Dyne [this message]
2021-01-26 15:54   ` [PATCH v9 09/11] block: check availablity for preadv/pwritev on mac Peter Maydell
2021-01-26  1:24 ` [PATCH v9 10/11] darwin: detect CoreAudio for build Joelle van Dyne
2021-01-26  7:09   ` Philippe Mathieu-Daudé
2021-01-26  1:24 ` [PATCH v9 11/11] darwin: remove 64-bit build detection on 32-bit OS Joelle van Dyne
2021-01-28 12:27 ` [PATCH v9 00/11] iOS and Apple Silicon host support Peter Maydell

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=20210126012457.39046-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.