[libvirt PATCH] tools: explain that '^' means 'Ctrl' for console escape sequence

Daniel P. Berrangé berrange at redhat.com
Fri Mar 27 15:42:43 UTC 2020


On Fri, Mar 27, 2020 at 04:34:48PM +0100, Michal Prívozník wrote:
> On 27. 3. 2020 16:11, Daniel P. Berrangé wrote:
> > Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> > ---
> >  tools/virsh-domain.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> > index 8591e483a5..ada0189685 100644
> > --- a/tools/virsh-domain.c
> > +++ b/tools/virsh-domain.c
> > @@ -3002,7 +3002,11 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom,
> >      }
> >  
> >      vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom));
> > -    vshPrintExtra(ctl, _("Escape character is %s\n"), priv->escapeChar);
> > +    vshPrintExtra(ctl, _("Escape character is %s"), priv->escapeChar);
> > +    if (priv->escapeChar[0] == '^') {
> > +        vshPrintExtra(ctl, " (Ctrl + %c)", priv->escapeChar[1]);
> > +    }

I'll remove the {} to keep syntax-check happy about single line "if"

> > +    vshPrintExtra(ctl, "\n");
> >      fflush(stdout);
> >      if (virshRunConsole(ctl, dom, name, flags) == 0)
> >          return true;
> > 
> 
> 
> Reviewed-by: Michal Privoznik <mprivozn at redhat.com>
> 
> Michal

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|




More information about the libvir-list mailing list