On 06/22/2016 06:08 PM, marcandre.lur...@redhat.com wrote: > From: Marc-André Lureau <marcandre.lur...@redhat.com> > > This is no longer necessary, now that middle mode has been removed. > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > docs/writing-qmp-commands.txt | 8 +- > hmp-commands-info.hx | 118 ++++++++++++------------ > hmp-commands.hx | 206 > +++++++++++++++++++++--------------------- > monitor.c | 11 +-- > 4 files changed, 168 insertions(+), 175 deletions(-)
The changes to hmp-commands*.hx are mechanical; you may want to set up
git to order the diff so that more relevant files like monitor.c are
listed first. Do that by 'git config diff.orderFile /path/to/file',
then in that file, listing globs in the order that you want to prioritize.
> +++ b/monitor.c
> @@ -130,13 +130,10 @@ typedef struct mon_cmd_t {
> const char *args_type;
> const char *params;
> const char *help;
> - union {
> - void (*cmd)(Monitor *mon, const QDict *qdict);
> - void (*cmd_new)(QDict *params, QObject **ret_data, Error **errp);
> - } mhandler;
> + void (*cmd)(Monitor *mon, const QDict *qdict);
> /* @sub_table is a list of 2nd level of commands. If it do not exist,
As long as you are touching this, fix the grammar bug: s/do/does/
> - * mhandler should be used. If it exist, sub_table[?].mhandler should be
> - * used, and mhandler of 1st level plays the role of help function.
> + * cmd should be used. If it exist, sub_table[?].cmd should be
s/exist/exists/
> + * used, and cmd of 1st level plays the role of help function.
> */
> struct mon_cmd_t *sub_table;
> void (*command_completion)(ReadLineState *rs, int nb_args, const char
> *str);
> @@ -2927,7 +2924,7 @@ static void handle_hmp_command(Monitor *mon, const char
> *cmdline)
> return;
> }
>
> - cmd->mhandler.cmd(mon, qdict);
> + cmd->cmd(mon, qdict);
> QDECREF(qdict);
> }
>
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
