From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: Greg Kurz <groug@kaod.org>, qemu-devel@nongnu.org
Cc: Guohuai Shi <guohuai.shi@windriver.com>,
Bin Meng <bin.meng@windriver.com>
Subject: Re: [PATCH v5 16/16] meson.build: Turn on virtfs for Windows
Date: Mon, 13 Mar 2023 13:53:30 +0100 [thread overview]
Message-ID: <3650827.9nNZqsIlJu@silver> (raw)
In-Reply-To: <20230220100815.1624266-17-bin.meng@windriver.com>
On Monday, February 20, 2023 11:08:15 AM CET Bin Meng wrote:
> From: Guohuai Shi <guohuai.shi@windriver.com>
>
> Enable virtfs configuration option for Windows host.
>
> Signed-off-by: Guohuai Shi <guohuai.shi@windriver.com>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
>
> meson.build | 10 +++++-----
> fsdev/meson.build | 1 +
> hw/9pfs/meson.build | 8 +++++---
> 3 files changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index a76c855312..9ddf254e78 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1755,16 +1755,16 @@ dbus_display = get_option('dbus_display') \
> .allowed()
>
> have_virtfs = get_option('virtfs') \
> - .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'),
> + .require(targetos == 'linux' or targetos == 'darwin' or targetos == 'windows',
> + error_message: 'virtio-9p (virtfs) requires Linux or macOS or Windows') \
> + .require(targetos == 'linux' or targetos == 'windows' 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()),
> + .require(targetos == 'darwin' or targetos == 'windows' 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 = targetos != 'darwin' and have_virtfs and have_tools
> +have_virtfs_proxy_helper = targetos != 'darwin' and targetos != 'windows' and have_virtfs and have_tools
>
> if get_option('block_drv_ro_whitelist') == ''
> config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '')
> diff --git a/fsdev/meson.build b/fsdev/meson.build
> index b632b66348..2aad081aef 100644
> --- a/fsdev/meson.build
> +++ b/fsdev/meson.build
> @@ -8,6 +8,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
> ), 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)
> +softmmu_ss.add_all(when: 'CONFIG_WIN32', if_true: fsdev_ss)
>
> if have_virtfs_proxy_helper
> executable('virtfs-proxy-helper',
> diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
> index 12443b6ad5..aaa50e71f7 100644
> --- a/hw/9pfs/meson.build
> +++ b/hw/9pfs/meson.build
> @@ -2,7 +2,6 @@ fs_ss = ss.source_set()
> fs_ss.add(files(
> '9p-local.c',
> '9p-posix-acl.c',
> - '9p-proxy.c',
> '9p-synth.c',
> '9p-xattr-user.c',
> '9p-xattr.c',
> @@ -13,8 +12,11 @@ fs_ss.add(files(
> 'coth.c',
> 'coxattr.c',
> ))
> -fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c'))
> -fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c'))
> +fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-proxy.c',
> + '9p-util-linux.c'))
> +fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-proxy.c',
> + '9p-util-darwin.c'))
> +fs_ss.add(when: 'CONFIG_WIN32', if_true: files('9p-util-win32.c'))
> fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c'))
This no longer applies on master because CONFIG_XEN has been renamed to
CONFIG_XEN_BUS.
> softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
>
>
next prev parent reply other threads:[~2023-03-13 12:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 10:07 [PATCH v5 00/16] hw/9pfs: Add 9pfs support for Windows Bin Meng
2023-02-20 10:08 ` [PATCH v5 01/16] hw/9pfs: Add missing definitions " Bin Meng
2023-02-20 10:08 ` [PATCH v5 02/16] hw/9pfs: Implement Windows specific utilities functions for 9pfs Bin Meng
2023-02-20 10:08 ` [PATCH v5 03/16] hw/9pfs: Replace the direct call to xxxdir() APIs with a wrapper Bin Meng
2023-03-06 9:31 ` Philippe Mathieu-Daudé
2023-03-06 9:35 ` Bin Meng
2023-02-20 10:08 ` [PATCH v5 04/16] hw/9pfs: Implement Windows specific xxxdir() APIs Bin Meng
2023-03-14 16:05 ` Christian Schoenebeck
2023-03-15 19:05 ` Shi, Guohuai
2023-03-16 11:05 ` Christian Schoenebeck
2023-03-16 17:28 ` Shi, Guohuai
2023-03-17 4:36 ` Shi, Guohuai
2023-03-17 12:16 ` Christian Schoenebeck
2023-02-20 10:08 ` [PATCH v5 05/16] hw/9pfs: Update the local fs driver to support Windows Bin Meng
2023-02-20 10:08 ` [PATCH v5 06/16] hw/9pfs: Support getting current directory offset for Windows Bin Meng
2023-02-20 10:08 ` [PATCH v5 07/16] hw/9pfs: Update helper qemu_stat_rdev() Bin Meng
2023-02-20 10:08 ` [PATCH v5 08/16] hw/9pfs: Add a helper qemu_stat_blksize() Bin Meng
2023-02-20 10:08 ` [PATCH v5 09/16] hw/9pfs: Disable unsupported flags and features for Windows Bin Meng
2023-02-20 10:08 ` [PATCH v5 10/16] hw/9pfs: Update v9fs_set_fd_limit() " Bin Meng
2023-02-20 10:08 ` [PATCH v5 11/16] hw/9pfs: Add Linux error number definition Bin Meng
2023-02-20 10:08 ` [PATCH v5 12/16] hw/9pfs: Translate Windows errno to Linux value Bin Meng
2023-02-20 10:08 ` [PATCH v5 13/16] fsdev: Disable proxy fs driver on Windows Bin Meng
2023-03-06 9:28 ` Philippe Mathieu-Daudé
2023-02-20 10:08 ` [PATCH v5 14/16] hw/9pfs: Update synth fs driver for Windows Bin Meng
2023-02-20 10:08 ` [PATCH v5 15/16] tests/qtest: virtio-9p-test: Adapt the case for win32 Bin Meng
2023-02-20 10:08 ` [PATCH v5 16/16] meson.build: Turn on virtfs for Windows Bin Meng
2023-03-13 12:53 ` Christian Schoenebeck [this message]
2023-03-06 6:04 ` [PATCH v5 00/16] hw/9pfs: Add 9pfs support " Bin Meng
2023-03-06 14:15 ` Christian Schoenebeck
2023-03-06 14:30 ` Philippe Mathieu-Daudé
2023-03-06 14:56 ` Bin Meng
2023-03-07 12:44 ` 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=3650827.9nNZqsIlJu@silver \
--to=qemu_oss@crudebyte.com \
--cc=bin.meng@windriver.com \
--cc=groug@kaod.org \
--cc=guohuai.shi@windriver.com \
--cc=qemu-devel@nongnu.org \
/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).