qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Will Cohen <wwcohen@gmail.com>
To: qemu-devel@nongnu.org
Cc: Keno Fischer <keno@juliacomputing.com>,
	Michael Roitzsch <reactorcontrol@icloud.com>
Subject: [PATCH 11/11] 9p: darwin: meson: Allow VirtFS on Darwin
Date: Wed, 13 Oct 2021 19:04:05 -0400	[thread overview]
Message-ID: <20211013230405.32170-12-wwcohen@gmail.com> (raw)
In-Reply-To: <20211013230405.32170-1-wwcohen@gmail.com>

From: Keno Fischer <keno@juliacomputing.com>

Signed-off-by: Keno Fischer <keno@juliacomputing.com>
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
---
 fsdev/meson.build |  1 +
 meson.build       | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 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 99a0a3e689..5e777b271d 100644
--- a/meson.build
+++ b/meson.build
@@ -1203,17 +1203,20 @@ have_host_block_device = (targetos != 'darwin' or
 # config-host.h #
 #################
 
-have_virtfs = (targetos == 'linux' and
-    have_system and
-    libattr.found() and
-    libcap_ng.found())
+if targetos == 'linux'
+  have_virtfs = (have_system and
+      libattr.found() and
+      libcap_ng.found())
+elif targetos == 'darwin'
+  have_virtfs = have_system
+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.33.0



  parent reply	other threads:[~2021-10-14  1:07 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-13 23:03 [PATCH 00/11] 9p: Add support for Darwin Will Cohen
2021-10-13 23:03 ` [PATCH 01/11] 9p: linux: Fix a couple Linux assumptions Will Cohen
2021-10-13 23:03 ` [PATCH 02/11] 9p: Rename 9p-util -> 9p-util-linux Will Cohen
2021-10-13 23:03 ` [PATCH 03/11] 9p: darwin: Handle struct stat(fs) differences Will Cohen
2021-10-13 23:03 ` [PATCH 04/11] 9p: darwin: Handle struct dirent differences Will Cohen
2021-10-13 23:03 ` [PATCH 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT} Will Cohen
2021-10-13 23:04 ` [PATCH 06/11] 9p: darwin: Compatibility defn for XATTR_SIZE_MAX Will Cohen
2021-10-13 23:04 ` [PATCH 07/11] 9p: darwin: *xattr_nofollow implementations Will Cohen
2021-10-13 23:04 ` [PATCH 08/11] 9p: darwin: Compatibility for f/l*xattr Will Cohen
2021-10-13 23:04 ` [PATCH 09/11] 9p: darwin: Provide a fallback implementation for utimensat Will Cohen
2021-10-13 23:04 ` [PATCH 10/11] 9p: darwin: Implement compatibility for mknodat Will Cohen
2021-10-13 23:04 ` Will Cohen [this message]
2021-10-15 12:10   ` [PATCH 11/11] 9p: darwin: meson: Allow VirtFS on Darwin Paolo Bonzini
2021-10-14  7:03 ` [PATCH 00/11] 9p: Add support for Darwin Greg Kurz
2021-10-14 10:48   ` Will Cohen
2021-10-14 11:57     ` Christian Schoenebeck
2021-10-14 12:22       ` Will Cohen
2021-10-14 12:55         ` Christian Schoenebeck
2021-10-14 13:23           ` Will Cohen
2021-10-20 12:38             ` 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=20211013230405.32170-12-wwcohen@gmail.com \
    --to=wwcohen@gmail.com \
    --cc=keno@juliacomputing.com \
    --cc=qemu-devel@nongnu.org \
    --cc=reactorcontrol@icloud.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).