[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [Patch for-2.5 v2 6/6] hmp: add monitor command to add/
From: |
Wen Congyang |
Subject: |
Re: [Qemu-block] [Patch for-2.5 v2 6/6] hmp: add monitor command to add/remove a child |
Date: |
Mon, 31 Aug 2015 09:09:36 +0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 |
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 <address@hidden>
> Signed-off-by: zhanghailiang <address@hidden>
> Signed-off-by: Gonglei <address@hidden>
> Cc: Luiz Capitulino <address@hidden>
> ---
> 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
> address@hidden child_add @var{device} @var{options}
> address@hidden 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
> address@hidden child_del @var{parent device} @var{child device}
> address@hidden 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
>
- [Qemu-block] [Patch for-2.5 v2 0/6] qapi: child add/delete support, Wen Congyang, 2015/08/11
- [Qemu-block] [Patch for-2.5 v2 2/6] support nbd driver in blockdev-add, Wen Congyang, 2015/08/11
- [Qemu-block] [Patch for-2.5 v2 3/6] Add new block driver interface to add/delete a BDS's child, Wen Congyang, 2015/08/11
- [Qemu-block] [Patch for-2.5 v2 6/6] hmp: add monitor command to add/remove a child, Wen Congyang, 2015/08/11
- Re: [Qemu-block] [Patch for-2.5 v2 6/6] hmp: add monitor command to add/remove a child,
Wen Congyang <=
- [Qemu-block] [Patch for-2.5 v2 5/6] qmp: add monitor command to add/remove a child, Wen Congyang, 2015/08/11
- [Qemu-block] [Patch for-2.5 v2 1/6] QAPI: move InetSocketAddress to qapi/common.json, Wen Congyang, 2015/08/11
- [Qemu-block] [Patch for-2.5 v2 4/6] quorum: implement bdrv_add_child() and bdrv_del_child(), Wen Congyang, 2015/08/11