61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Mon, 27 Jan 2020 19:01:08 +0000
|
|
Subject: [PATCH] virtiofsd: make -f (foreground) the default
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
According to vhost-user.rst "Backend program conventions", backend
|
|
programs should run in the foregound by default. Follow the
|
|
conventions so libvirt and other management tools can control virtiofsd
|
|
in a standard way.
|
|
|
|
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 0bbd31753714ac2899efda0f0de31e353e965789)
|
|
---
|
|
tools/virtiofsd/helper.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
|
|
index 676032e71f..a3645fc807 100644
|
|
--- a/tools/virtiofsd/helper.c
|
|
+++ b/tools/virtiofsd/helper.c
|
|
@@ -29,6 +29,11 @@
|
|
{ \
|
|
t, offsetof(struct fuse_cmdline_opts, p), 1 \
|
|
}
|
|
+#define FUSE_HELPER_OPT_VALUE(t, p, v) \
|
|
+ { \
|
|
+ t, offsetof(struct fuse_cmdline_opts, p), v \
|
|
+ }
|
|
+
|
|
|
|
static const struct fuse_opt fuse_helper_opts[] = {
|
|
FUSE_HELPER_OPT("-h", show_help),
|
|
@@ -42,6 +47,7 @@ static const struct fuse_opt fuse_helper_opts[] = {
|
|
FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),
|
|
FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),
|
|
FUSE_HELPER_OPT("-f", foreground),
|
|
+ FUSE_HELPER_OPT_VALUE("--daemonize", foreground, 0),
|
|
FUSE_HELPER_OPT("fsname=", nodefault_subtype),
|
|
FUSE_OPT_KEY("fsname=", FUSE_OPT_KEY_KEEP),
|
|
FUSE_HELPER_OPT("subtype=", nodefault_subtype),
|
|
@@ -131,6 +137,7 @@ void fuse_cmdline_help(void)
|
|
" -V --version print version\n"
|
|
" -d -o debug enable debug output (implies -f)\n"
|
|
" -f foreground operation\n"
|
|
+ " --daemonize run in background\n"
|
|
" -o max_idle_threads the maximum number of idle worker "
|
|
"threads\n"
|
|
" allowed (default: 10)\n");
|
|
@@ -158,6 +165,7 @@ int fuse_parse_cmdline(struct fuse_args *args, struct fuse_cmdline_opts *opts)
|
|
memset(opts, 0, sizeof(struct fuse_cmdline_opts));
|
|
|
|
opts->max_idle_threads = 10;
|
|
+ opts->foreground = 1;
|
|
|
|
if (fuse_opt_parse(args, opts, fuse_helper_opts, fuse_helper_opt_proc) ==
|
|
-1) {
|