[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/19] 9p: darwin: meson: Allow VirtFS on Darwin
From: |
Christian Schoenebeck |
Subject: |
[PULL 11/19] 9p: darwin: meson: Allow VirtFS on Darwin |
Date: |
Fri, 04 Mar 2022 13:27:49 +0100 |
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
- Rebase to master]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
Message-Id: <20220227223522.91937-12-wwcohen@gmail.com>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
fsdev/meson.build | 1 +
meson.build | 12 +++++++-----
2 files changed, 8 insertions(+), 5 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 6058ea3896..32d91690ee 100644
--- a/meson.build
+++ b/meson.build
@@ -1462,14 +1462,16 @@ dbus_display = get_option('dbus_display') \
.allowed()
have_virtfs = get_option('virtfs') \
- .require(targetos == 'linux',
- error_message: 'virtio-9p (virtfs) requires Linux') \
- .require(libattr.found() and libcap_ng.found(),
- error_message: 'virtio-9p (virtfs) requires libcap-ng-devel and
libattr-devel') \
+ .require(targetos == 'linux' or targetos == 'darwin',
+ error_message: 'virtio-9p (virtfs) requires Linux or macOS') \
+ .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'),
+ error_message: 'virtio-9p (virtfs) on macOS requires the presence
of pthread_fchdir_np') \
+ .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()),
+ error_message: 'virtio-9p (virtfs) on Linux requires
libcap-ng-devel and libattr-devel') \
.disable_auto_if(not have_tools and not have_system) \
.allowed()
-have_virtfs_proxy_helper = have_virtfs and have_tools
+have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools
foreach k : get_option('trace_backends')
config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
--
2.20.1
- [PULL 00/19] 9p queue 2022-03-04, Christian Schoenebeck, 2022/03/04
- [PULL 13/19] 9pfs: drop Doxygen format from qemu_dirent_dup() API comment, Christian Schoenebeck, 2022/03/04
- [PULL 07/19] 9p: darwin: *xattr_nofollow implementations, Christian Schoenebeck, 2022/03/04
- [PULL 15/19] 9pfs/codir.c: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/04
- [PULL 19/19] fsdev/p9array.h: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/04
- [PULL 01/19] 9p: linux: Fix a couple Linux assumptions, Christian Schoenebeck, 2022/03/04
- [PULL 17/19] 9pfs/9p-util.h: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/04
- [PULL 16/19] 9pfs/9p.c: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/04
- [PULL 11/19] 9p: darwin: meson: Allow VirtFS on Darwin,
Christian Schoenebeck <=
- [PULL 04/19] 9p: darwin: Handle struct dirent differences, Christian Schoenebeck, 2022/03/04
- [PULL 08/19] 9p: darwin: Compatibility for f/l*xattr, Christian Schoenebeck, 2022/03/04
- [PULL 02/19] 9p: Rename 9p-util -> 9p-util-linux, Christian Schoenebeck, 2022/03/04
- [PULL 09/19] 9p: darwin: Implement compatibility for mknodat, Christian Schoenebeck, 2022/03/04
- [PULL 18/19] 9pfs/coth.h: drop Doxygen format on v9fs_co_run_in_worker(), Christian Schoenebeck, 2022/03/04
- [PULL 05/19] 9p: darwin: Ignore O_{NOATIME, DIRECT}, Christian Schoenebeck, 2022/03/04
- [PULL 10/19] 9p: darwin: Adjust assumption on virtio-9p-test, Christian Schoenebeck, 2022/03/04
- [PULL 06/19] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX, Christian Schoenebeck, 2022/03/04
- [PULL 14/19] 9pfs/9p.h: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/04
- [PULL 03/19] 9p: darwin: Handle struct stat(fs) differences, Christian Schoenebeck, 2022/03/04