[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/11] 9p: darwin: meson: Allow VirtFS on Darwin
From: |
Will Cohen |
Subject: |
[PATCH v2 11/11] 9p: darwin: meson: Allow VirtFS on Darwin |
Date: |
Sun, 21 Nov 2021 19:49:13 -0500 |
From: Keno Fischer <keno@juliacomputing.com>
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>
---
fsdev/meson.build | 1 +
meson.build | 12 ++++++++----
2 files changed, 9 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 96de1a6ef9..0f92adea52 100644
--- a/meson.build
+++ b/meson.build
@@ -1383,17 +1383,21 @@ endif
have_host_block_device = (targetos != 'darwin' or
cc.has_header('IOKit/storage/IOMedia.h'))
-have_virtfs = (targetos == 'linux' and
+if targetos == 'darwin'
+ 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 == 'linux' 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 Darwin')
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.34.0
- [PATCH v2 04/11] 9p: darwin: Handle struct dirent differences, (continued)
- [PATCH v2 04/11] 9p: darwin: Handle struct dirent differences, Will Cohen, 2021/11/21
- [PATCH v2 06/11] 9p: darwin: Compatibility defn for XATTR_SIZE_MAX, Will Cohen, 2021/11/21
- [PATCH v2 07/11] 9p: darwin: *xattr_nofollow implementations, Will Cohen, 2021/11/21
- [PATCH v2 08/11] 9p: darwin: Compatibility for f/l*xattr, Will Cohen, 2021/11/21
- [PATCH v2 10/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2021/11/21
- [PATCH v2 11/11] 9p: darwin: meson: Allow VirtFS on Darwin,
Will Cohen <=
- [PATCH v2 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT}, Will Cohen, 2021/11/21
- [PATCH v2 03/11] 9p: darwin: Handle struct stat(fs) differences, Will Cohen, 2021/11/21
- [PATCH v2 09/11] 9p: darwin: Provide fallback impl for utimensat, Will Cohen, 2021/11/21