ping & Cc'ing qemu-trivial@ (reviewed twice) ...
On 8/16/21 8:04 PM, Philippe Mathieu-Daudé wrote:
> 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 <qinw...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@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 fc8b1506297..10a1a33761d 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"
>