[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 030/104] virtiofsd: add --print-capabilities option
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PATCH 030/104] virtiofsd: add --print-capabilities option |
Date: |
Thu, 12 Dec 2019 16:37:50 +0000 |
From: Stefan Hajnoczi <address@hidden>
Add the --print-capabilities option as per vhost-user.rst "Backend
programs conventions". Currently there are no advertised features.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
docs/interop/vhost-user.json | 4 +++-
tools/virtiofsd/fuse_lowlevel.h | 1 +
tools/virtiofsd/helper.c | 2 ++
tools/virtiofsd/passthrough_ll.c | 12 ++++++++++++
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/docs/interop/vhost-user.json b/docs/interop/vhost-user.json
index da6aaf51c8..d4ea1f7ac5 100644
--- a/docs/interop/vhost-user.json
+++ b/docs/interop/vhost-user.json
@@ -31,6 +31,7 @@
# @rproc-serial: virtio remoteproc serial link
# @scsi: virtio scsi
# @vsock: virtio vsock transport
+# @fs: virtio fs (since 4.2)
#
# Since: 4.0
##
@@ -50,7 +51,8 @@
'rpmsg',
'rproc-serial',
'scsi',
- 'vsock'
+ 'vsock',
+ 'fs'
]
}
diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowlevel.h
index 081bb1abb3..6c63cb740c 100644
--- a/tools/virtiofsd/fuse_lowlevel.h
+++ b/tools/virtiofsd/fuse_lowlevel.h
@@ -1826,6 +1826,7 @@ struct fuse_cmdline_opts {
int nodefault_subtype;
int show_version;
int show_help;
+ int print_capabilities;
int clone_fd;
unsigned int max_idle_threads;
};
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
index d4fff4fa53..4c9a3b2fc9 100644
--- a/tools/virtiofsd/helper.c
+++ b/tools/virtiofsd/helper.c
@@ -39,6 +39,7 @@ static const struct fuse_opt fuse_helper_opts[] = {
FUSE_HELPER_OPT("--help", show_help),
FUSE_HELPER_OPT("-V", show_version),
FUSE_HELPER_OPT("--version", show_version),
+ FUSE_HELPER_OPT("--print-capabilities", print_capabilities),
FUSE_HELPER_OPT("-d", debug),
FUSE_HELPER_OPT("debug", debug),
FUSE_HELPER_OPT("-d", foreground),
@@ -136,6 +137,7 @@ void fuse_cmdline_help(void)
{
printf(" -h --help print help\n"
" -V --version print version\n"
+ " --print-capabilities print vhost-user.json\n"
" -d -o debug enable debug output (implies -f)\n"
" -f foreground operation\n"
" --daemonize run in background\n"
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 23531d791d..68bacb6fc5 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -1298,6 +1298,14 @@ static struct fuse_lowlevel_ops lo_oper = {
.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[])
{
struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
@@ -1328,6 +1336,10 @@ int main(int argc, char *argv[])
fuse_lowlevel_version();
ret = 0;
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) {
--
2.23.0
- [PATCH 020/104] virtiofsd: Start queue threads, (continued)
- [PATCH 020/104] virtiofsd: Start queue threads, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 007/104] virtiofsd: Format imported files to qemu style, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 025/104] virtiofsd: Add Makefile wiring for virtiofsd contrib, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 024/104] virtiofsd: Keep track of replies, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 026/104] virtiofsd: Fast path for virtio read, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 027/104] virtiofsd: add --fd=FDNUM fd passing option, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 022/104] virtiofsd: Start reading commands from queue, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 023/104] virtiofsd: Send replies to messages, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 030/104] virtiofsd: add --print-capabilities option,
Dr. David Alan Gilbert (git) <=
- [PATCH 031/104] virtiofs: Add maintainers entry, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 028/104] virtiofsd: make -f (foreground) the default, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 029/104] virtiofsd: add vhost-user.json file, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 032/104] virtiofsd: passthrough_ll: create new files in caller's context, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 033/104] virtiofsd: passthrough_ll: add lo_map for ino/fh indirection, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 034/104] virtiofsd: passthrough_ll: add ino_map to hide lo_inode pointers, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 036/104] virtiofsd: passthrough_ll: add fd_map to hide file descriptors, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 037/104] virtiofsd: passthrough_ll: add fallback for racy ops, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 038/104] virtiofsd: validate path components, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 040/104] virtiofsd: Pass write iov's all the way through, Dr. David Alan Gilbert (git), 2019/12/12