[for-2.5,v2,6/6] hmp: add monitor command to add/remove a child

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
---
 blockdev.c                | 33 +++++++++++++++++++++++++++++++++
 hmp-commands.hx           | 28 ++++++++++++++++++++++++++++
 include/sysemu/blockdev.h |  2 ++
 3 files changed, 63 insertions(+)

Ping...
Patch 1-4 have been reviewed by Alberto Garcia
Luiz Capitulino, Markus Armbruster, do you have time to review the monitor command implementation?

Thanks
Wen Congyang

On 08/11/2015 03:51 PM, Wen Congyang wrote:
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> Cc: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  blockdev.c                | 33 +++++++++++++++++++++++++++++++++
>  hmp-commands.hx           | 28 ++++++++++++++++++++++++++++
>  include/sysemu/blockdev.h |  2 ++
>  3 files changed, 63 insertions(+)
> 
> diff --git a/blockdev.c b/blockdev.c
> index df40e92..4d9dfd9 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -2203,6 +2203,39 @@ static void do_child_add(const char *device, QDict *opts, Error **errp)
>      }
>  }
>  
> +void hmp_child_add(Monitor *mon, const QDict *qdict)
> +{
> +    const char *id = qdict_get_str(qdict, "id");
> +    const char *optstr = qdict_get_str(qdict, "opts");
> +    QemuOpts *opts;
> +    QDict *bs_opts = qdict_new();
> +    Error *local_err = NULL;
> +
> +    opts = drive_def(optstr);
> +    if (!opts) {
> +        /* We have reported error in drive_def */
> +        return;
> +    }
> +
> +    bs_opts = qemu_opts_to_qdict(opts, bs_opts);
> +    do_child_add(id, bs_opts, &local_err);
> +    if (local_err) {
> +        error_report_err(local_err);
> +    }
> +}
> +
> +void hmp_child_del(Monitor *mon, const QDict *qdict)
> +{
> +    const char *id = qdict_get_str(qdict, "id");
> +    const char *child_id = qdict_get_str(qdict, "child");
> +    Error *local_err = NULL;
> +
> +    qmp_child_del(id, child_id, &local_err);
> +    if (local_err) {
> +        error_report_err(local_err);
> +    }
> +}
> +
>  void qmp_block_resize(bool has_device, const char *device,
>                        bool has_node_name, const char *node_name,
>                        int64_t size, Error **errp)
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index d3b7932..1d5b392 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -193,6 +193,34 @@ actions (drive options rerror, werror).
>  ETEXI
>  
>      {
> +        .name       = "child_add",
> +        .args_type  = "id:B,opts:s",
> +        .params     = "device child.file=file",
> +        .help       = "add a child to a BDS",
> +        .mhandler.cmd = hmp_child_add,
> +    },
> +
> +STEXI
> +@item child_add @var{device} @var{options}
> +@findex child_add
> +Add a child to the block device.
> +ETEXI
> +
> +    {
> +        .name       = "child_del",
> +        .args_type  = "id:B,child:B",
> +        .params     = "parent child",
> +        .help       = "remove a child from a BDS",
> +        .mhandler.cmd = hmp_child_del,
> +    },
> +
> +STEXI
> +@item child_del @var{parent device} @var{child device}
> +@findex child_del
> +Remove a child from the parent device.
> +ETEXI
> +
> +    {
>          .name       = "change",
>          .args_type  = "device:B,target:F,arg:s?",
>          .params     = "device filename [format]",
> diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
> index 3104150..594bfab 100644
> --- a/include/sysemu/blockdev.h
> +++ b/include/sysemu/blockdev.h
> @@ -67,4 +67,6 @@ void qmp_change_blockdev(const char *device, const char *filename,
>                           const char *format, Error **errp);
>  void hmp_commit(Monitor *mon, const QDict *qdict);
>  void hmp_drive_del(Monitor *mon, const QDict *qdict);
> +void hmp_child_add(Monitor *mon, const QDict *qdict);
> +void hmp_child_del(Monitor *mon, const QDict *qdict);
>  #endif
>

Wen Congyang <wency@cn.fujitsu.com> writes:

> Ping...
> Patch 1-4 have been reviewed by Alberto Garcia
> Luiz Capitulino, Markus Armbruster, do you have time to review the
> monitor command implementation?

I will review at least the QMP parts of this series.  My review queue
has become painfully long...  I apologize for the delay, and have to ask
you for even more patience.