All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Cohen <wwcohen@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Christian Schoenebeck" <qemu_oss@crudebyte.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Greg Kurz" <groug@kaod.org>,
	hi@alyssa.is, "Michael Roitzsch" <reactorcontrol@icloud.com>,
	"Will Cohen" <wwcohen@gmail.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Keno Fischer" <keno@juliacomputing.com>
Subject: [PATCH v8 11/11] 9p: darwin: meson: Allow VirtFS on Darwin
Date: Sun, 20 Feb 2022 11:50:56 -0500	[thread overview]
Message-ID: <20220220165056.72289-12-wwcohen@gmail.com> (raw)
In-Reply-To: <20220220165056.72289-1-wwcohen@gmail.com>

From: Keno Fischer <keno@juliacomputing.com>

To allow VirtFS on darwin, we need to check that pthread_fchdir_np is
available, which has only been available since macOS 10.12.

Additionally, virtfs_proxy_helper is disabled on Darwin. This patch
series does not currently provide an implementation of the proxy-helper,
but this functionality could be implemented later on.

Signed-off-by: Keno Fischer <keno@juliacomputing.com>
[Michael Roitzsch: - Rebase for NixOS]
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
[Will Cohen: - Rebase to master]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
[Will Cohen: - Add check for pthread_fchdir_np to virtfs
             - Add comments to patch commit
             - Note that virtfs_proxy_helper does not work
               on macOS
             - Fully adjust meson virtfs error note to specify
               macOS]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
---
 fsdev/meson.build |  1 +
 meson.build       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/fsdev/meson.build b/fsdev/meson.build
index adf57cc43e..b632b66348 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
   'qemu-fsdev.c',
 ), if_false: files('qemu-fsdev-dummy.c'))
 softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
+softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
 
 if have_virtfs_proxy_helper
   executable('virtfs-proxy-helper',
diff --git a/meson.build b/meson.build
index 6fdc0281ad..b6f5c57487 100644
--- a/meson.build
+++ b/meson.build
@@ -1416,17 +1416,23 @@ if not get_option('dbus_display').disabled()
   endif
 endif
 
-have_virtfs = (targetos == 'linux' and
+if targetos == 'darwin' and cc.has_function('pthread_fchdir_np')
+  have_virtfs = have_system
+else
+  have_virtfs = (targetos == 'linux' and
     have_system and
     libattr.found() and
     libcap_ng.found())
+endif
 
-have_virtfs_proxy_helper = have_virtfs and have_tools
+have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools
 
 if get_option('virtfs').enabled()
   if not have_virtfs
-    if targetos != 'linux'
-      error('virtio-9p (virtfs) requires Linux')
+    if targetos != 'linux' and targetos != 'darwin'
+      error('virtio-9p (virtfs) requires Linux or macOS')
+    elif targetos == 'darwin' and not cc.has_function('pthread_fchdir_np')
+      error('virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np')
     elif not libcap_ng.found() or not libattr.found()
       error('virtio-9p (virtfs) requires libcap-ng-devel and libattr-devel')
     elif not have_system
-- 
2.35.1



      parent reply	other threads:[~2022-02-20 17:12 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-20 16:50 [PATCH v8 00/11] 9p: Add support for darwin Will Cohen
2022-02-20 16:50 ` [PATCH v8 01/11] 9p: linux: Fix a couple Linux assumptions Will Cohen
2022-02-20 16:50 ` [PATCH v8 02/11] 9p: Rename 9p-util -> 9p-util-linux Will Cohen
2022-02-20 16:50 ` [PATCH v8 03/11] 9p: darwin: Handle struct stat(fs) differences Will Cohen
2022-02-20 16:50 ` [PATCH v8 04/11] 9p: darwin: Handle struct dirent differences Will Cohen
2022-02-20 21:28   ` Christian Schoenebeck
2022-02-20 21:35     ` Will Cohen
2022-02-20 16:50 ` [PATCH v8 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT} Will Cohen
2022-02-20 16:50 ` [PATCH v8 06/11] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX Will Cohen
2022-02-20 16:50 ` [PATCH v8 07/11] 9p: darwin: *xattr_nofollow implementations Will Cohen
2022-02-20 16:50 ` [PATCH v8 08/11] 9p: darwin: Compatibility for f/l*xattr Will Cohen
2022-02-20 16:50 ` [PATCH v8 09/11] 9p: darwin: Implement compatibility for mknodat Will Cohen
2022-02-20 21:51   ` Christian Schoenebeck
2022-02-22 14:27   ` Christian Schoenebeck
2022-02-25 14:00     ` Will Cohen
2022-02-25 16:31       ` Christian Schoenebeck
2022-02-25 16:38         ` Will Cohen
2022-02-25 16:44           ` Christian Schoenebeck
2022-02-20 16:50 ` [PATCH v8 10/11] 9p: darwin: Adjust assumption on virtio-9p-test Will Cohen
2022-02-20 16:50 ` Will Cohen [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=20220220165056.72289-12-wwcohen@gmail.com \
    --to=wwcohen@gmail.com \
    --cc=f4bug@amsat.org \
    --cc=groug@kaod.org \
    --cc=hi@alyssa.is \
    --cc=keno@juliacomputing.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu_oss@crudebyte.com \
    --cc=reactorcontrol@icloud.com \
    --cc=thuth@redhat.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.