* Laszlo Ersek (ler...@redhat.com) wrote:
> On 01/30/14 11:20, Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
> >
> > Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> > Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> > ---
> > vl.c | 52 +++++++++++++++++++++++++++++++++++++++-------------
> > 1 file changed, 39 insertions(+), 13 deletions(-)
> >
> > diff --git a/vl.c b/vl.c
> > index 7f4fe0d..5f993e4 100644
> > --- a/vl.c
> > +++ b/vl.c
> > @@ -531,6 +531,27 @@ static QemuOptsList qemu_msg_opts = {
> > },
> > };
> >
> > +static QemuOptsList qemu_name_opts = {
> > + .name = "name",
> > + .implied_opt_name = "guest",
> > + .merge_lists = true,
> > + .head = QTAILQ_HEAD_INITIALIZER(qemu_name_opts.head),
> > + .desc = {
> > + {
> > + .name = "guest",
> > + .type = QEMU_OPT_STRING,
> > + .help = "Sets the name of the guest.\n"
> > + "This name will be displayed in the SDL window
> > caption.\n"
> > + "The name will also be used for the VNC server",
> > + }, {
> > + .name = "process",
> > + .type = QEMU_OPT_STRING,
> > + .help = "Sets the name of the QEMU process, as shown in top
> > etc",
<snip>
> I have one question, but it doesn't block my R-b:
>
> Did you test (and if so, how) the new .help text for "guest"? Because it
> seems to be the only such text that has newline characters embedded. I
> looked around the tree a bit, and it seems that the only way to get
> these option texts is the "query-command-line-options" QMP command
> (apparently not available via HMP). If that's the case, then the
> embedded newlines could / should be dropped. But I don't really care
> about those.
I'd checked every piece of output I'd found, but hadn't found
the query-command-line-options; I think you're right there
are no other \n's in there - but also all the other .help texts
are much briefer and less chatty; maybe I need to just chop
them down to a minimum, I wonder if there is anywhere they're
ever displayed to a human?
Dave
> Reviewed-by: Laszlo Ersek <ler...@redhat.com>
>
> Thanks
> Laszlo
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
