Skip to content

Commit

Permalink
hmp-commands.hx: List abbreviation after command for cont, quit, print
Browse files Browse the repository at this point in the history
We have four HMP commands which have a single-character abbreviated
version: cont ('c'), quit ('q'), print ('p') and help ('h').  For
cont, quit and print, we list the abbreviation first in the help
documentation and the command name.  This has the odd effect that in
the full 'help' command list these commands end up sorted out of
alphabetical order (they end up after all the other commands that
start with the same letter).  As it happens, the only place this
currently changes the order is for 'cont'.

Abbreviation first is also not a very logical order, and it doesn't
match what we use for 'help' (which is 'help|?').  Put the full
command name first in both the help text and the .name field for
cont, quit and print.

Fixes: https://bugs.launchpad.net/qemu/+bug/1614609
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20201121151711.20783-1-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  • Loading branch information
pm215 authored and dagrh committed Dec 18, 2020
1 parent 33b1fa9 commit ff688cd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions hmp-commands.hx
Expand Up @@ -40,7 +40,7 @@ SRST
ERST

{
.name = "q|quit",
.name = "quit|q",
.args_type = "",
.params = "",
.help = "quit the emulator",
Expand All @@ -49,7 +49,7 @@ ERST
},

SRST
``q`` or ``quit``
``quit`` or ``q``
Quit the emulator.
ERST

Expand Down Expand Up @@ -401,15 +401,15 @@ SRST
ERST

{
.name = "c|cont",
.name = "cont|c",
.args_type = "",
.params = "",
.help = "resume emulation",
.cmd = hmp_cont,
},

SRST
``c`` or ``cont``
``cont`` or ``c``
Resume emulation.
ERST

Expand Down Expand Up @@ -554,15 +554,15 @@ SRST
ERST

{
.name = "p|print",
.name = "print|p",
.args_type = "fmt:/,val:l",
.params = "/fmt expr",
.help = "print expression value (use $reg for CPU register access)",
.cmd = do_print,
},

SRST
``p`` or ``print/``\ *fmt* *expr*
``print`` or ``p/``\ *fmt* *expr*
Print expression value. Only the *format* part of *fmt* is
used.
ERST
Expand Down

0 comments on commit ff688cd

Please sign in to comment.