diff mbox series

[29/30] virtiofsd: add --print-capabilities option

Message ID 20191021105832.36574-30-dgilbert@redhat.com
State New
Headers show
Series virtiofs daemon (base) | expand

Commit Message

Dr. David Alan Gilbert Oct. 21, 2019, 10:58 a.m. UTC 
From: Stefan Hajnoczi <stefanha@redhat.com>

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: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 contrib/virtiofsd/fuse_lowlevel.h  |  1 +
 contrib/virtiofsd/helper.c         |  2 ++
 contrib/virtiofsd/passthrough_ll.c | 12 ++++++++++++
 docs/interop/vhost-user.json       |  4 +++-
 4 files changed, 18 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/contrib/virtiofsd/fuse_lowlevel.h b/contrib/virtiofsd/fuse_lowlevel.h
index b06ab6915a..ab964a6fb3 100644
--- a/contrib/virtiofsd/fuse_lowlevel.h
+++ b/contrib/virtiofsd/fuse_lowlevel.h
@@ -1796,6 +1796,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/contrib/virtiofsd/helper.c b/contrib/virtiofsd/helper.c
index ab20810c28..08e00c0d13 100644
--- a/contrib/virtiofsd/helper.c
+++ b/contrib/virtiofsd/helper.c
@@ -35,6 +35,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),
@@ -132,6 +133,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/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthrough_ll.c
index c09fc4a65c..2a1a880224 100644
--- a/contrib/virtiofsd/passthrough_ll.c
+++ b/contrib/virtiofsd/passthrough_ll.c
@@ -1216,6 +1216,14 @@  static struct fuse_lowlevel_ops lo_oper = {
 #endif
 };
 
+/* 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);
@@ -1246,6 +1254,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)
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'
   ]
 }