diff mbox series

[v1] tools: fix incorrect suggestions for XENCONSOLED_TRACE on FreeBSD

Message ID 20210504135021.8394-1-olaf@aepfle.de (mailing list archive)
State New
Headers show
Series [v1] tools: fix incorrect suggestions for XENCONSOLED_TRACE on FreeBSD | expand

Commit Message

Olaf Hering May 4, 2021, 1:50 p.m. UTC
--log does not take a file, it specifies what is supposed to be logged.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrew Cooper May 4, 2021, 5:47 p.m. UTC | #1
On 04/05/2021 14:50, Olaf Hering wrote:
> --log does not take a file, it specifies what is supposed to be logged.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>.  That said, ...

> ---
>  tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
> index ccd5a9b055..36dd717944 100644
> --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
> +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
> @@ -23,7 +23,7 @@ required_files="/dev/xen/xenstored"
>  
>  XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid"
>  XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
> -#XENCONSOLED_TRACE="@XEN_LOG_DIR@/xenconsole-trace.log"
> +#XENCONSOLED_TRACE="none|guest|hv|all"
>  #XENSTORED_TRACE="@XEN_LOG_DIR@/xen/xenstore-trace.log"

It would probably be clearer to untangle these in one go, leaving the
result looking like:

XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
#XENCONSOLED_TRACE="none|guest|hv|all"

XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid"
#XENSTORED_TRACE="@XEN_LOG_DIR@/xen/xenstore-trace.log"

I'd also be tempted to fold this and the NetBSD change together.  It's
not as if these bugfixes are distro-specific.


It looks like a bug in NetBSD in c/s 2e8644e1d90, which was copied into
FreeBSD by c/s 5dcdb2bf569.  (P.S. Sorry Roger - both your bugs,
starting from a decade ago).  It really is idiotic that we've got a
commonly named *_TRACE variable with totally different semantics for the
two daemons.  Then again, its far too late to fix this :(

~Andrew
Olaf Hering May 6, 2021, 2:36 p.m. UTC | #2
Am Tue, 4 May 2021 18:47:12 +0100
schrieb Andrew Cooper <andrew.cooper3@citrix.com>:

> I'd also be tempted to fold this and the NetBSD change together.  It's
> not as if these bugfixes are distro-specific.

I will redo the BSD patches as you suggested.

Olaf
Roger Pau Monné May 7, 2021, 7:25 a.m. UTC | #3
On Tue, May 04, 2021 at 06:47:12PM +0100, Andrew Cooper wrote:
> On 04/05/2021 14:50, Olaf Hering wrote:
> > --log does not take a file, it specifies what is supposed to be logged.
> >
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>.  That said, ...
> 
> > ---
> >  tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
> > index ccd5a9b055..36dd717944 100644
> > --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
> > +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
> > @@ -23,7 +23,7 @@ required_files="/dev/xen/xenstored"
> >  
> >  XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid"
> >  XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
> > -#XENCONSOLED_TRACE="@XEN_LOG_DIR@/xenconsole-trace.log"
> > +#XENCONSOLED_TRACE="none|guest|hv|all"
> >  #XENSTORED_TRACE="@XEN_LOG_DIR@/xen/xenstore-trace.log"
> 
> It would probably be clearer to untangle these in one go, leaving the
> result looking like:
> 
> XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
> #XENCONSOLED_TRACE="none|guest|hv|all"
> 
> XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid"
> #XENSTORED_TRACE="@XEN_LOG_DIR@/xen/xenstore-trace.log"
> 
> I'd also be tempted to fold this and the NetBSD change together.  It's
> not as if these bugfixes are distro-specific.
> 
> 
> It looks like a bug in NetBSD in c/s 2e8644e1d90, which was copied into
> FreeBSD by c/s 5dcdb2bf569.  (P.S. Sorry Roger - both your bugs,
> starting from a decade ago).  It really is idiotic that we've got a
> commonly named *_TRACE variable with totally different semantics for the
> two daemons.  Then again, its far too late to fix this :(

Ups, sorry. Feel free to fix those in one go, and add my:

Acked-by: Roger Pau Monné <roger.pau@citrix.com>

Thanks, Roger.
diff mbox series

Patch

diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index ccd5a9b055..36dd717944 100644
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -23,7 +23,7 @@  required_files="/dev/xen/xenstored"
 
 XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid"
 XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
-#XENCONSOLED_TRACE="@XEN_LOG_DIR@/xenconsole-trace.log"
+#XENCONSOLED_TRACE="none|guest|hv|all"
 #XENSTORED_TRACE="@XEN_LOG_DIR@/xen/xenstore-trace.log"
 
 load_rc_config $name