summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2021-08-16 20:04:42 +0200
committerKevin Wolf2021-10-06 10:25:55 +0200
commitd1bbd965bd96028b0f5a8e3dc01b37f1f8ae4456 (patch)
tree4e13c7f0fee93ff35c912c1f24b55ae60aeea774
parentinclude/block.h: remove outdated comment (diff)
downloadqemu-d1bbd965bd96028b0f5a8e3dc01b37f1f8ae4456.tar.gz
qemu-d1bbd965bd96028b0f5a8e3dc01b37f1f8ae4456.tar.xz
qemu-d1bbd965bd96028b0f5a8e3dc01b37f1f8ae4456.zip
qemu-storage-daemon: Only display FUSE help when FUSE is built-in
When configuring QEMU with --disable-fuse, the qemu-storage-daemon still reports FUSE command line options in its help: $ qemu-storage-daemon -h Usage: qemu-storage-daemon [options] QEMU storage daemon --export [type=]fuse,id=<id>,node-name=<node-name>,mountpoint=<file> [,growable=on|off][,writable=on|off] export the specified block node over FUSE Remove this help message when FUSE is disabled, to avoid: $ qemu-storage-daemon --export fuse qemu-storage-daemon: --export fuse: Invalid parameter 'fuse' Reported-by: Qing Wang <qinwang@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20210816180442.2000642-1-philmd@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--storage-daemon/qemu-storage-daemon.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index fc8b150629..10a1a33761 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -98,10 +98,12 @@ static void help(void)
" export the specified block node over NBD\n"
" (requires --nbd-server)\n"
"\n"
+#ifdef CONFIG_FUSE
" --export [type=]fuse,id=<id>,node-name=<node-name>,mountpoint=<file>\n"
" [,growable=on|off][,writable=on|off]\n"
" export the specified block node over FUSE\n"
"\n"
+#endif /* CONFIG_FUSE */
" --monitor [chardev=]name[,mode=control][,pretty[=on|off]]\n"
" configure a QMP monitor\n"
"\n"