[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 015/109] virtiofsd: Add options for virtio
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PATCH v2 015/109] virtiofsd: Add options for virtio |
Date: |
Tue, 21 Jan 2020 12:22:59 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
Add options to specify parameters for virtio-fs paths, i.e.
./virtiofsd -o vhost_user_socket=/tmp/vhostqemu
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
tools/virtiofsd/fuse_i.h | 1 +
tools/virtiofsd/fuse_lowlevel.c | 15 ++++++++++-----
tools/virtiofsd/helper.c | 16 ++++++++--------
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h
index bae06992e0..26b1a7da88 100644
--- a/tools/virtiofsd/fuse_i.h
+++ b/tools/virtiofsd/fuse_i.h
@@ -63,6 +63,7 @@ struct fuse_session {
struct fuse_notify_req notify_list;
size_t bufsize;
int error;
+ char *vu_socket_path;
};
struct fuse_chan {
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index 861a0b6c31..ca1ea78fba 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2117,8 +2117,11 @@ reply_err:
}
static const struct fuse_opt fuse_ll_opts[] = {
- LL_OPTION("debug", debug, 1), LL_OPTION("-d", debug, 1),
- LL_OPTION("--debug", debug, 1), LL_OPTION("allow_root", deny_others, 1),
+ LL_OPTION("debug", debug, 1),
+ LL_OPTION("-d", debug, 1),
+ LL_OPTION("--debug", debug, 1),
+ LL_OPTION("allow_root", deny_others, 1),
+ LL_OPTION("--socket-path=%s", vu_socket_path, 0),
FUSE_OPT_END
};
@@ -2134,9 +2137,11 @@ void fuse_lowlevel_help(void)
* These are not all options, but the ones that are
* potentially of interest to an end-user
*/
- printf(" -o allow_other allow access by all users\n"
- " -o allow_root allow access by root\n"
- " -o auto_unmount auto unmount on process termination\n");
+ printf(
+ " -o allow_other allow access by all users\n"
+ " -o allow_root allow access by root\n"
+ " --socket-path=PATH path for the vhost-user socket\n"
+ " -o auto_unmount auto unmount on process
termination\n");
}
void fuse_session_destroy(struct fuse_session *se)
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
index 0ad34f0619..1dc497a7ca 100644
--- a/tools/virtiofsd/helper.c
+++ b/tools/virtiofsd/helper.c
@@ -127,14 +127,14 @@ static const struct fuse_opt conn_info_opt_spec[] = {
void fuse_cmdline_help(void)
{
- printf(
- " -h --help print help\n"
- " -V --version print version\n"
- " -d -o debug enable debug output (implies -f)\n"
- " -f foreground operation\n"
- " -s disable multi-threaded operation\n"
- " -o max_idle_threads the maximum number of idle worker
threads\n"
- " allowed (default: 10)\n");
+ printf(" -h --help print help\n"
+ " -V --version print version\n"
+ " -d -o debug enable debug output (implies -f)\n"
+ " -f foreground operation\n"
+ " -s disable multi-threaded operation\n"
+ " -o max_idle_threads the maximum number of idle worker "
+ "threads\n"
+ " allowed (default: 10)\n");
}
static int fuse_helper_opt_proc(void *data, const char *arg, int key,
--
2.24.1
- [PATCH v2 004/109] virtiofsd: Add fuse_lowlevel.c, (continued)
- [PATCH v2 004/109] virtiofsd: Add fuse_lowlevel.c, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 008/109] virtiofsd: remove mountpoint dummy argument, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 009/109] virtiofsd: remove unused notify reply support, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 010/109] virtiofsd: Fix fuse_daemonize ignored return values, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 011/109] virtiofsd: Fix common header and define for QEMU builds, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 007/109] virtiofsd: Format imported files to qemu style, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 012/109] virtiofsd: Trim out compatibility code, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 013/109] vitriofsd/passthrough_ll: fix fallocate() ifdefs, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 015/109] virtiofsd: Add options for virtio,
Dr. David Alan Gilbert (git) <=
- [PATCH v2 014/109] virtiofsd: Make fsync work even if only inode is passed in, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 016/109] virtiofsd: add -o source=PATH to help output, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 017/109] virtiofsd: Open vhost connection instead of mounting, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 018/109] virtiofsd: Start wiring up vhost-user, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 020/109] virtiofsd: get/set features callbacks, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 019/109] virtiofsd: Add main virtio loop, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 022/109] virtiofsd: Poll kick_fd for queue, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 021/109] virtiofsd: Start queue threads, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 023/109] virtiofsd: Start reading commands from queue, Dr. David Alan Gilbert (git), 2020/01/21