[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH COLO-BLOCK v7 03/17] hmp: add monitor command to add
From: |
Wen Congyang |
Subject: |
[Qemu-devel] [PATCH COLO-BLOCK v7 03/17] hmp: add monitor command to add/remove a child |
Date: |
Tue, 30 Jun 2015 11:34:31 +0800 |
Signed-off-by: Wen Congyang <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Gonglei <address@hidden>
---
blockdev.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++
hmp-commands.hx | 28 +++++++++++++++++++++++++
include/sysemu/blockdev.h | 2 ++
3 files changed, 83 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index b354676..935c081 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2189,6 +2189,59 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict)
aio_context_release(aio_context);
}
+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();
+ BlockDriverState *bs;
+ 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);
+
+ bs = bdrv_lookup_bs(id, id, &local_err);
+ if (!bs) {
+ error_report_err(local_err);
+ return;
+ }
+
+ bdrv_add_child(bs, 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");
+ BlockDriverState *bs, *child_bs;
+ Error *local_err = NULL;
+
+ bs = bdrv_lookup_bs(id, id, &local_err);
+ if (!bs) {
+ error_report_err(local_err);
+ return;
+ }
+
+ child_bs = bdrv_lookup_bs(child_id, child_id, &local_err);
+ if (!child_bs) {
+ error_report_err(local_err);
+ return;
+ }
+
+ bdrv_del_child(bs, child_bs, &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
--
2.4.3
- [Qemu-devel] [PATCH COLO-BLOCK v7 00/17] Block replication for continuous checkpoints, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 01/17] Add new block driver interface to add/delete a BDS's child, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 04/17] introduce a new API qemu_opts_absorb_qdict_by_index(), Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 03/17] hmp: add monitor command to add/remove a child,
Wen Congyang <=
- [Qemu-devel] [PATCH COLO-BLOCK v7 05/17] quorum: allow ignoring child errors, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 06/17] introduce a new API to enable/disable attach device model, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 08/17] block: make bdrv_put_ref_bh_schedule() as a public API, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 07/17] introduce a new API to check if blk is attached, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 09/17] Backup: clear all bitmap when doing block checkpoint, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 11/17] Allow creating backup jobs when opening BDS, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 10/17] allow writing to the backing file, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 12/17] block: Allow references for backing files, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 13/17] docs: block replication's description, Wen Congyang, 2015/06/29
- [Qemu-devel] [PATCH COLO-BLOCK v7 15/17] skip nbd_target when starting block replication, Wen Congyang, 2015/06/29