virtiofsd: Remove build and docs glue

Remove all the virtiofsd build and docs infrastructure.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2023-01-18 12:10:07 +00:00
parent 5da7701e2a
commit 8ab5e8a503
12 changed files with 0 additions and 55 deletions

View File

@ -2096,10 +2096,8 @@ virtiofs
M: Dr. David Alan Gilbert <dgilbert@redhat.com> M: Dr. David Alan Gilbert <dgilbert@redhat.com>
M: Stefan Hajnoczi <stefanha@redhat.com> M: Stefan Hajnoczi <stefanha@redhat.com>
S: Supported S: Supported
F: tools/virtiofsd/*
F: hw/virtio/vhost-user-fs* F: hw/virtio/vhost-user-fs*
F: include/hw/virtio/vhost-user-fs.h F: include/hw/virtio/vhost-user-fs.h
F: docs/tools/virtiofsd.rst
L: virtio-fs@redhat.com L: virtio-fs@redhat.com
virtio-input virtio-input

View File

@ -290,10 +290,6 @@ man_pages = [
('tools/virtfs-proxy-helper', 'virtfs-proxy-helper', ('tools/virtfs-proxy-helper', 'virtfs-proxy-helper',
'QEMU 9p virtfs proxy filesystem helper', 'QEMU 9p virtfs proxy filesystem helper',
['M. Mohan Kumar'], 1), ['M. Mohan Kumar'], 1),
('tools/virtiofsd', 'virtiofsd',
'QEMU virtio-fs shared file system daemon',
['Stefan Hajnoczi <stefanha@redhat.com>',
'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1),
] ]
man_make_section_directory = False man_make_section_directory = False

View File

@ -48,7 +48,6 @@ if build_docs
'qemu-storage-daemon.1': (have_tools ? 'man1' : ''), 'qemu-storage-daemon.1': (have_tools ? 'man1' : ''),
'qemu-trace-stap.1': (stap.found() ? 'man1' : ''), 'qemu-trace-stap.1': (stap.found() ? 'man1' : ''),
'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''), 'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
'qemu.1': 'man1', 'qemu.1': 'man1',
'qemu-block-drivers.7': 'man7', 'qemu-block-drivers.7': 'man7',
'qemu-cpu-models.7': 'man7' 'qemu-cpu-models.7': 'man7'

View File

@ -16,4 +16,3 @@ command line utilities and other standalone programs.
qemu-pr-helper qemu-pr-helper
qemu-trace-stap qemu-trace-stap
virtfs-proxy-helper virtfs-proxy-helper
virtiofsd

View File

@ -3879,7 +3879,6 @@ if have_block
summary_info += {'Block whitelist (ro)': get_option('block_drv_ro_whitelist')} summary_info += {'Block whitelist (ro)': get_option('block_drv_ro_whitelist')}
summary_info += {'Use block whitelist in tools': get_option('block_drv_whitelist_in_tools')} summary_info += {'Use block whitelist in tools': get_option('block_drv_whitelist_in_tools')}
summary_info += {'VirtFS support': have_virtfs} summary_info += {'VirtFS support': have_virtfs}
summary_info += {'build virtiofs daemon': have_virtiofsd}
summary_info += {'Live block migration': config_host_data.get('CONFIG_LIVE_BLOCK_MIGRATION')} summary_info += {'Live block migration': config_host_data.get('CONFIG_LIVE_BLOCK_MIGRATION')}
summary_info += {'replication support': config_host_data.get('CONFIG_REPLICATION')} summary_info += {'replication support': config_host_data.get('CONFIG_REPLICATION')}
summary_info += {'bochs support': get_option('bochs').allowed()} summary_info += {'bochs support': get_option('bochs').allowed()}

View File

@ -272,8 +272,6 @@ option('vhost_user_blk_server', type: 'feature', value: 'auto',
description: 'build vhost-user-blk server') description: 'build vhost-user-blk server')
option('virtfs', type: 'feature', value: 'auto', option('virtfs', type: 'feature', value: 'auto',
description: 'virtio-9p support') description: 'virtio-9p support')
option('virtiofsd', type: 'feature', value: 'auto',
description: 'build virtiofs daemon (virtiofsd)')
option('libvduse', type: 'feature', value: 'auto', option('libvduse', type: 'feature', value: 'auto',
description: 'build VDUSE Library') description: 'build VDUSE Library')
option('vduse_blk_export', type: 'feature', value: 'auto', option('vduse_blk_export', type: 'feature', value: 'auto',

View File

@ -138,7 +138,6 @@
--disable-vhost-vdpa \ --disable-vhost-vdpa \
--disable-virglrenderer \ --disable-virglrenderer \
--disable-virtfs \ --disable-virtfs \
--disable-virtiofsd \
--disable-vnc \ --disable-vnc \
--disable-vnc-jpeg \ --disable-vnc-jpeg \
--disable-png \ --disable-png \
@ -191,7 +190,6 @@
--enable-tpm \ --enable-tpm \
--enable-trace-backends=dtrace \ --enable-trace-backends=dtrace \
--enable-usb-redir \ --enable-usb-redir \
--enable-virtiofsd \
--enable-vhost-kernel \ --enable-vhost-kernel \
--enable-vhost-net \ --enable-vhost-net \
--enable-vhost-user \ --enable-vhost-user \

View File

@ -132,9 +132,6 @@ util
xen xen
~ (/qemu)?(.*/xen.*) ~ (/qemu)?(.*/xen.*)
virtiofsd
~ (/qemu)?(/tools/virtiofsd/.*)
(headers) (headers)
~ (/qemu)?(/include/.*) ~ (/qemu)?(/include/.*)

View File

@ -175,7 +175,6 @@ meson_options_help() {
printf "%s\n" ' vhost-vdpa vhost-vdpa kernel backend support' printf "%s\n" ' vhost-vdpa vhost-vdpa kernel backend support'
printf "%s\n" ' virglrenderer virgl rendering support' printf "%s\n" ' virglrenderer virgl rendering support'
printf "%s\n" ' virtfs virtio-9p support' printf "%s\n" ' virtfs virtio-9p support'
printf "%s\n" ' virtiofsd build virtiofs daemon (virtiofsd)'
printf "%s\n" ' vmnet vmnet.framework network backend support' printf "%s\n" ' vmnet vmnet.framework network backend support'
printf "%s\n" ' vnc VNC server' printf "%s\n" ' vnc VNC server'
printf "%s\n" ' vnc-jpeg JPEG lossy compression for VNC server' printf "%s\n" ' vnc-jpeg JPEG lossy compression for VNC server'
@ -461,8 +460,6 @@ _meson_option_parse() {
--disable-virglrenderer) printf "%s" -Dvirglrenderer=disabled ;; --disable-virglrenderer) printf "%s" -Dvirglrenderer=disabled ;;
--enable-virtfs) printf "%s" -Dvirtfs=enabled ;; --enable-virtfs) printf "%s" -Dvirtfs=enabled ;;
--disable-virtfs) printf "%s" -Dvirtfs=disabled ;; --disable-virtfs) printf "%s" -Dvirtfs=disabled ;;
--enable-virtiofsd) printf "%s" -Dvirtiofsd=enabled ;;
--disable-virtiofsd) printf "%s" -Dvirtiofsd=disabled ;;
--enable-vmnet) printf "%s" -Dvmnet=enabled ;; --enable-vmnet) printf "%s" -Dvmnet=enabled ;;
--disable-vmnet) printf "%s" -Dvmnet=disabled ;; --disable-vmnet) printf "%s" -Dvmnet=disabled ;;
--enable-vnc) printf "%s" -Dvnc=enabled ;; --enable-vnc) printf "%s" -Dvnc=enabled ;;

View File

@ -1,13 +0,0 @@
have_virtiofsd = get_option('virtiofsd') \
.require(targetos == 'linux',
error_message: 'virtiofsd requires Linux') \
.require(seccomp.found() and libcap_ng.found(),
error_message: 'virtiofsd requires libcap-ng-devel and seccomp-devel') \
.require(have_vhost_user,
error_message: 'virtiofsd needs vhost-user-support') \
.disable_auto_if(not have_tools and not have_system) \
.allowed()
if have_virtiofsd
subdir('virtiofsd')
endif

View File

@ -1,5 +0,0 @@
{
"description": "QEMU virtiofsd vhost-user-fs",
"type": "fs",
"binary": "@libexecdir@/virtiofsd"
}

View File

@ -1,18 +0,0 @@
executable('virtiofsd', files(
'buffer.c',
'fuse_opt.c',
'fuse_log.c',
'fuse_lowlevel.c',
'fuse_signals.c',
'fuse_virtio.c',
'helper.c',
'passthrough_ll.c',
'passthrough_seccomp.c'),
dependencies: [seccomp, qemuutil, libcap_ng, vhost_user],
install: true,
install_dir: get_option('libexecdir'))
configure_file(input: '50-qemu-virtiofsd.json.in',
output: '50-qemu-virtiofsd.json',
configuration: { 'libexecdir' : get_option('prefix') / get_option('libexecdir') },
install_dir: qemu_datadir / 'vhost-user')