122 lines
4.1 KiB
Diff
122 lines
4.1 KiB
Diff
|
From 23d81ee7564084f29e32fedaed5196ae1a5a3240 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
Date: Mon, 27 Jan 2020 19:01:10 +0100
|
||
|
|
Subject: [PATCH 039/116] virtiofsd: add --print-capabilities option
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Message-id: <20200127190227.40942-36-dgilbert@redhat.com>
|
||
|
|
Patchwork-id: 93486
|
||
|
|
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 035/112] virtiofsd: add --print-capabilities option
|
||
|
|
Bugzilla: 1694164
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
||
|
|
|
||
|
|
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: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
(cherry picked from commit 45018fbb0a73ce66fd3dd87ecd2872b45658add4)
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
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 da6aaf5..d4ea1f7 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 f6b3470..0d61df8 100644
|
||
|
|
--- a/tools/virtiofsd/fuse_lowlevel.h
|
||
|
|
+++ b/tools/virtiofsd/fuse_lowlevel.h
|
||
|
|
@@ -1794,6 +1794,7 @@ struct fuse_cmdline_opts {
|
||
|
|
int nodefault_subtype;
|
||
|
|
int show_version;
|
||
|
|
int show_help;
|
||
|
|
+ int print_capabilities;
|
||
|
|
unsigned int max_idle_threads;
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
|
||
|
|
index a3645fc..b8ec5ac 100644
|
||
|
|
--- a/tools/virtiofsd/helper.c
|
||
|
|
+++ b/tools/virtiofsd/helper.c
|
||
|
|
@@ -40,6 +40,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),
|
||
|
|
@@ -135,6 +136,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 037c5d7..cd27c09 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) {
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|