* [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in
@ 2021-08-16 18:04 Philippe Mathieu-Daudé
2021-08-16 21:03 ` Eric Blake
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-08-16 18:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Qing Wang, Philippe Mathieu-Daudé, qemu-block
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>
---
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"
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in
2021-08-16 18:04 [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in Philippe Mathieu-Daudé
@ 2021-08-16 21:03 ` Eric Blake
2021-08-17 8:28 ` Hanna Reitz
2021-09-15 21:36 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 5+ messages in thread
From: Eric Blake @ 2021-08-16 21:03 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Kevin Wolf, Qing Wang, qemu-devel, qemu-block
On Mon, Aug 16, 2021 at 08:04:42PM +0200, 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 <qinwang@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> storage-daemon/qemu-storage-daemon.c | 2 ++
> 1 file changed, 2 insertions(+)
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in
2021-08-16 18:04 [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in Philippe Mathieu-Daudé
2021-08-16 21:03 ` Eric Blake
@ 2021-08-17 8:28 ` Hanna Reitz
2021-09-15 21:36 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 5+ messages in thread
From: Hanna Reitz @ 2021-08-17 8:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Kevin Wolf, Qing Wang, qemu-block
On 16.08.21 20:04, 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 <qinwang@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> storage-daemon/qemu-storage-daemon.c | 2 ++
> 1 file changed, 2 insertions(+)
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in
2021-08-16 18:04 [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in Philippe Mathieu-Daudé
2021-08-16 21:03 ` Eric Blake
2021-08-17 8:28 ` Hanna Reitz
@ 2021-09-15 21:36 ` Philippe Mathieu-Daudé
2021-09-16 7:43 ` Kevin Wolf
2 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-15 21:36 UTC (permalink / raw)
To: qemu-devel, QEMU Trivial; +Cc: Kevin Wolf, Qing Wang, qemu-block
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 <qinwang@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@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"
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in
2021-09-15 21:36 ` Philippe Mathieu-Daudé
@ 2021-09-16 7:43 ` Kevin Wolf
0 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2021-09-16 7:43 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: QEMU Trivial, Qing Wang, qemu-devel, qemu-block
Am 15.09.2021 um 23:36 hat Philippe Mathieu-Daudé geschrieben:
> 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 <qinwang@redhat.com>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-09-16 7:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-16 18:04 [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in Philippe Mathieu-Daudé
2021-08-16 21:03 ` Eric Blake
2021-08-17 8:28 ` Hanna Reitz
2021-09-15 21:36 ` Philippe Mathieu-Daudé
2021-09-16 7:43 ` Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.