motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-10 02:54:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtiofsd: add --print-capabilities option

Browse source 
Add the --print-capabilities option as per vhost-user.rst "Backend
programs conventions".  Currently there are no advertised features.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2019-08-27 10:54:35 +01:00 • committed by Dr. David Alan Gilbert
parent 315616ed50
commit 45018fbb0a
4 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/interop/vhost-user.json
View file

@ -31,6 +31,7 @@
# @rproc-serial: virtio remoteproc serial link # @rproc-serial: virtio remoteproc serial link
# @scsi: virtio scsi # @scsi: virtio scsi
# @vsock: virtio vsock transport # @vsock: virtio vsock transport
# @fs: virtio fs (since 4.2)
# #
# Since: 4.0 # Since: 4.0
## ##
@ -50,7 +51,8 @@
'rpmsg', 'rpmsg',
'rproc-serial', 'rproc-serial',
'scsi', 'scsi',
'vsock' 'vsock',
'fs'
] ]
} }

1
tools/virtiofsd/fuse_lowlevel.h
View file

@ -1794,6 +1794,7 @@ struct fuse_cmdline_opts {
int nodefault_subtype; int nodefault_subtype;
int show_version; int show_version;
int show_help; int show_help;
int print_capabilities;
unsigned int max_idle_threads; unsigned int max_idle_threads;
}; };

2
tools/virtiofsd/helper.c
View file

@ -40,6 +40,7 @@ static const struct fuse_opt fuse_helper_opts[] = {
FUSE_HELPER_OPT("--help", show_help), FUSE_HELPER_OPT("--help", show_help),
FUSE_HELPER_OPT("-V", show_version), FUSE_HELPER_OPT("-V", show_version),
FUSE_HELPER_OPT("--version", show_version), FUSE_HELPER_OPT("--version", show_version),
FUSE_HELPER_OPT("--print-capabilities", print_capabilities),
FUSE_HELPER_OPT("-d", debug), FUSE_HELPER_OPT("-d", debug),
FUSE_HELPER_OPT("debug", debug), FUSE_HELPER_OPT("debug", debug),
FUSE_HELPER_OPT("-d", foreground), FUSE_HELPER_OPT("-d", foreground),
@ -135,6 +136,7 @@ void fuse_cmdline_help(void)
{ {
printf(" -h --help print help\n" printf(" -h --help print help\n"
" -V --version print version\n" " -V --version print version\n"
" --print-capabilities print vhost-user.json\n"
" -d -o debug enable debug output (implies -f)\n" " -d -o debug enable debug output (implies -f)\n"
" -f foreground operation\n" " -f foreground operation\n"
" --daemonize run in background\n" " --daemonize run in background\n"

12
tools/virtiofsd/passthrough_ll.c
View file

@ -1298,6 +1298,14 @@ static struct fuse_lowlevel_ops lo_oper = {
.lseek = lo_lseek, .lseek = lo_lseek,
}; };
/* Print vhost-user.json backend program capabilities */
static void print_capabilities(void)
{
printf("{\n");
printf(" \"type\": \"fs\"\n");
printf("}\n");
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct fuse_args args = FUSE_ARGS_INIT(argc, argv); struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
@ -1328,6 +1336,10 @@ int main(int argc, char *argv[])
fuse_lowlevel_version(); fuse_lowlevel_version();
ret = 0; ret = 0;
goto err_out1; goto err_out1;
} else if (opts.print_capabilities) {
print_capabilities();
ret = 0;
goto err_out1;
} }
if (fuse_opt_parse(&args, &lo, lo_opts, NULL) == -1) { if (fuse_opt_parse(&args, &lo, lo_opts, NULL) == -1) {