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>,
	Roman Bolshakov <r.bolshakov@yadro.com>,
	Joelle van Dyne <j@getutm.app>,
	"open list:raw" <qemu-block@nongnu.org>,
	Max Reitz <mreitz@redhat.com>
Subject: [PATCH v6 7/7] block: check availablity for preadv/pwritev on mac
Date: Mon,  4 Jan 2021 18:20:55 -0800	[thread overview]
Message-ID: <20210105022055.12113-8-j@getutm.app> (raw)
In-Reply-To: <20210105022055.12113-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 9f556322e6..f109e1f305 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1390,17 +1390,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-05  2:27 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-05  2:20 [PATCH v6 0/7] iOS and Apple Silicon host support Joelle van Dyne
2021-01-05  2:20 ` [PATCH v6 1/7] configure: option to disable host block devices Joelle van Dyne
2021-01-05  2:20 ` [PATCH v6 2/7] configure: cross-compiling with empty cross_prefix Joelle van Dyne
2021-01-05  2:20 ` [PATCH v6 3/7] qemu: add support for iOS host Joelle van Dyne
2021-01-12 11:56   ` Philippe Mathieu-Daudé
2021-01-12 22:18     ` Joelle van Dyne
2021-01-12 15:03   ` Peter Maydell
2021-01-12 22:37     ` Joelle van Dyne
2021-01-21 18:53   ` Peter Maydell
2023-11-28 15:12     ` Philippe Mathieu-Daudé
2021-01-05  2:20 ` [PATCH v6 4/7] coroutine: add libucontext as external library Joelle van Dyne
2021-01-21 16:17   ` Daniel P. Berrangé
2021-01-21 17:11     ` Joelle van Dyne
2021-01-05  2:20 ` [PATCH v6 5/7] configure: cross compile should use x86_64 cpu_family Joelle van Dyne
2021-01-12 11:46   ` Philippe Mathieu-Daudé
2021-01-05  2:20 ` [PATCH v6 6/7] slirp: update build flags for iOS resolv fix Joelle van Dyne
2021-01-12 11:52   ` Philippe Mathieu-Daudé
2021-01-14 11:07     ` [Slirp] " Marc-André Lureau
2021-01-05  2:20 ` Joelle van Dyne [this message]
2021-01-12 11:01 ` [PATCH v6 0/7] iOS and Apple Silicon host support Peter Maydell
2021-01-12 22:05   ` 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=20210105022055.12113-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 \
    --cc=r.bolshakov@yadro.com \
    /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.