Re: [PATCH 2/2] docs/interop: Delete qmp-intro.txt

[Peter Maydell]

On Thu, 20 Apr 2023 at 20:43, Eric Blake <eblake@redhat.com> wrote:
>
> On Thu, Apr 20, 2023 at 04:03:52PM +0100, Peter Maydell wrote:
> > qmp-intro.txt is quite small and provides very little information
> > that isn't already in the documentation elsewhere.  Fold the example
> > command lines into qemu-options.hx, and delete the now-unneeded plain
> > text document.
> >
> > While we're touching the qemu-options.hx documentation text,
> > wordsmith it a little bit and improve the rST formatting.
> >
> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> > ---
> >  docs/interop/qmp-intro.txt | 88 --------------------------------------
> >  qemu-options.hx            | 26 ++++++++---
> >  2 files changed, 21 insertions(+), 93 deletions(-)
> >  delete mode 100644 docs/interop/qmp-intro.txt
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
> >  DEF("mon", HAS_ARG, QEMU_OPTION_mon, \
> >      "-mon [chardev=]name[,mode=readline|control][,pretty[=on|off]]\n", 
> > QEMU_ARCH_ALL)
> >  SRST
> >  ``-mon [chardev=]name[,mode=readline|control][,pretty[=on|off]]``
> > -    Setup monitor on chardev name. ``mode=control`` configures
> > -    a QMP monitor (a JSON RPC-style protocol) and it is not the
> > -    same as HMP, the human monitor that has a "(qemu)" prompt.
> > +    Set up a monitor connected to the chardev ``name``.
> > +    QEMU supports two monitors: the Human Monitor Protocol
> > +    (HMP; for human interaction), and the QEMU Monitor Protocol
> > +    (QMP; a JSON RPC-style protocol).
> > +    The default is HMP; ``mode=control`` selects QMP instead.
> >      ``pretty`` is only valid when ``mode=control``,
>
> Is the pre-existing trailing space on this line important to rST?

I don't think so -- it's just a line I didn't touch.

-- PMM