[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/13] qemu-storage-daemon: Only display FUSE help when FUSE is bu
From: |
Kevin Wolf |
Subject: |
[PULL 02/13] qemu-storage-daemon: Only display FUSE help when FUSE is built-in |
Date: |
Wed, 6 Oct 2021 12:59:12 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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>
---
storage-daemon/qemu-storage-daemon.c | 2 ++
1 file changed, 2 insertions(+)
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"
--
2.31.1
- [PULL 00/13] Block layer patches, Kevin Wolf, 2021/10/06
- [PULL 01/13] include/block.h: remove outdated comment, Kevin Wolf, 2021/10/06
- [PULL 02/13] qemu-storage-daemon: Only display FUSE help when FUSE is built-in,
Kevin Wolf <=
- [PULL 03/13] block: implement bdrv_new_open_driver_opts(), Kevin Wolf, 2021/10/06
- [PULL 04/13] block: bdrv_insert_node(): fix and improve error handling, Kevin Wolf, 2021/10/06
- [PULL 05/13] block: bdrv_insert_node(): doc and style, Kevin Wolf, 2021/10/06
- [PULL 06/13] block: bdrv_insert_node(): don't use bdrv_open(), Kevin Wolf, 2021/10/06
- [PULL 07/13] iotests/image-fleecing: declare requirement of copy-before-write, Kevin Wolf, 2021/10/06
- [PULL 08/13] block: introduce max_hw_iov for use in scsi-generic, Kevin Wolf, 2021/10/06
- [PULL 09/13] iotests: add 'qemu' package location to PYTHONPATH in testenv, Kevin Wolf, 2021/10/06
- [PULL 10/13] iotests/linters: check mypy files all at once, Kevin Wolf, 2021/10/06
- [PULL 11/13] iotests/mirror-top-perms: Adjust imports, Kevin Wolf, 2021/10/06
- [PULL 12/13] iotests/migrate-bitmaps-test: delint, Kevin Wolf, 2021/10/06