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>,
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 v3 10/11] 9p: darwin: meson: Allow VirtFS on Darwin
Date: Thu, 27 Jan 2022 19:56:10 -0500 [thread overview]
Message-ID: <20220128005611.87185-11-wwcohen@gmail.com> (raw)
In-Reply-To: <20220128005611.87185-1-wwcohen@gmail.com>
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>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.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 e0cfafe8d9..726c618982 100644
--- a/meson.build
+++ b/meson.build
@@ -1420,17 +1420,21 @@ if not get_option('dbus_display').disabled()
endif
endif
-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.1
next prev parent reply other threads:[~2022-01-28 1:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 0:56 [PATCH v3 00/11] This is a followup to https://lists.gnu.org/archive/html/qemu-devel/2021-11/msg04325.html, Will Cohen
2022-01-28 0:56 ` [PATCH v3 01/11] 9p: linux: Fix a couple Linux assumptions Will Cohen
2022-01-28 15:52 ` Greg Kurz
2022-01-28 0:56 ` [PATCH v3 02/11] 9p: Rename 9p-util -> 9p-util-linux Will Cohen
2022-01-28 16:27 ` Greg Kurz
2022-01-28 0:56 ` [PATCH v3 03/11] 9p: darwin: Handle struct stat(fs) differences Will Cohen
2022-02-02 17:48 ` Christian Schoenebeck
2022-01-28 0:56 ` [PATCH v3 04/11] 9p: darwin: Handle struct dirent differences Will Cohen
2022-02-02 15:07 ` Will Cohen
2022-02-02 17:37 ` Christian Schoenebeck
2022-02-02 18:31 ` Will Cohen
2022-01-28 0:56 ` [PATCH v3 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT} Will Cohen
2022-01-28 0:56 ` [PATCH v3 06/11] 9p: darwin: Compatibility defn for XATTR_SIZE_MAX Will Cohen
2022-01-28 16:02 ` Christian Schoenebeck
2022-01-28 0:56 ` [PATCH v3 07/11] 9p: darwin: *xattr_nofollow implementations Will Cohen
2022-01-28 0:56 ` [PATCH v3 08/11] 9p: darwin: Compatibility for f/l*xattr Will Cohen
2022-01-28 0:56 ` [PATCH v3 09/11] 9p: darwin: Implement compatibility for mknodat Will Cohen
2022-01-28 0:56 ` Will Cohen [this message]
2022-01-28 0:56 ` [PATCH v3 11/11] 9p: darwin: adjust assumption on virtio-9p-test Will Cohen
2022-01-28 7:03 ` Thomas Huth
2022-01-28 13:38 ` Will Cohen
2022-01-28 15:28 ` Christian Schoenebeck
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=20220128005611.87185-11-wwcohen@gmail.com \
--to=wwcohen@gmail.com \
--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.