From: Wen Congyang <wency@cn.fujitsu.com>
To: qemu devel <qemu-devel@nongnu.org>,
Eric Blake <eblake@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Alberto Garcia <berto@igalia.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu block <qemu-block@nongnu.org>,
Jiang Yunhong <yunhong.jiang@intel.com>,
Dong Eddie <eddie.dong@intel.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Gonglei <arei.gonglei@huawei.com>,
Yang Hongyang <yanghy@cn.fujitsu.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>
Subject: [Qemu-devel] [PATCH v3 2/5] Add new block driver interface to add/delete a BDS's child
Date: Thu, 10 Sep 2015 17:55:02 +0800 [thread overview]
Message-ID: <1441878905-5272-3-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1441878905-5272-1-git-send-email-wency@cn.fujitsu.com>
In some cases, we want to take a quorum child offline, and take
another child online.
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>
---
block.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++
include/block/block.h | 5 +++++
include/block/block_int.h | 5 +++++
3 files changed, 62 insertions(+)
diff --git a/block.c b/block.c
index d004bd0..682d2ec 100644
--- a/block.c
+++ b/block.c
@@ -4115,3 +4115,55 @@ void bdrv_refresh_filename(BlockDriverState *bs)
QDECREF(json);
}
}
+
+/*
+ * Hot add/remove a BDS's child. So the user can take a child offline when
+ * it is broken and take a new child online
+ */
+void bdrv_add_child(BlockDriverState *parent_bs, BlockDriverState *child_bs,
+ Error **errp)
+{
+
+ if (!parent_bs->drv || !parent_bs->drv->bdrv_add_child) {
+ error_setg(errp, "The BDS %s doesn't support adding a child",
+ bdrv_get_device_or_node_name(parent_bs));
+ return;
+ }
+
+ if (child_bs->blk) {
+ error_setg(errp, "The BDS %s is used by the block device %s",
+ child_bs->node_name, blk_name(child_bs->blk));
+ return;
+ }
+
+ /* TODO: check if the child bs has parent */
+
+ parent_bs->drv->bdrv_add_child(parent_bs, child_bs, errp);
+}
+
+void bdrv_del_child(BlockDriverState *parent_bs, BlockDriverState *child_bs,
+ Error **errp)
+{
+ BdrvChild *child;
+
+ if (!parent_bs->drv || !parent_bs->drv->bdrv_del_child) {
+ error_setg(errp, "The BDS %s doesn't support removing a child",
+ bdrv_get_device_or_node_name(parent_bs));
+ return;
+ }
+
+ QLIST_FOREACH(child, &parent_bs->children, next) {
+ if (child->bs == child_bs) {
+ break;
+ }
+ }
+
+ if (!child) {
+ error_setg(errp, "The BDS %s is not the BDS %s's child",
+ bdrv_get_device_or_node_name(child_bs),
+ bdrv_get_device_or_node_name(parent_bs));
+ return;
+ }
+
+ parent_bs->drv->bdrv_del_child(parent_bs, child_bs, errp);
+}
diff --git a/include/block/block.h b/include/block/block.h
index a4e31af..8480af7 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -603,4 +603,9 @@ void bdrv_io_plug(BlockDriverState *bs);
void bdrv_io_unplug(BlockDriverState *bs);
void bdrv_flush_io_queue(BlockDriverState *bs);
+void bdrv_add_child(BlockDriverState *parent, BlockDriverState *child,
+ Error **errp);
+void bdrv_del_child(BlockDriverState *parent, BlockDriverState *child,
+ Error **errp);
+
#endif
diff --git a/include/block/block_int.h b/include/block/block_int.h
index ca1eefa..b4d5250 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -288,6 +288,11 @@ struct BlockDriver {
*/
int (*bdrv_probe_geometry)(BlockDriverState *bs, HDGeometry *geo);
+ void (*bdrv_add_child)(BlockDriverState *parent, BlockDriverState *child,
+ Error **errp);
+ void (*bdrv_del_child)(BlockDriverState *parent, BlockDriverState *child,
+ Error **errp);
+
QLIST_ENTRY(BlockDriver) list;
};
--
2.4.3
next prev parent reply other threads:[~2015-09-10 9:56 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-10 9:55 [Qemu-devel] [PATCH v3 0/5] qapi: child add/delete support Wen Congyang
2015-09-10 9:55 ` [Qemu-devel] [PATCH v3 1/5] support nbd driver in blockdev-add Wen Congyang
2015-09-14 14:27 ` Markus Armbruster
2015-09-14 15:47 ` Eric Blake
2015-09-15 1:39 ` Wen Congyang
2015-09-15 7:37 ` Markus Armbruster
2015-09-15 8:01 ` Wen Congyang
2015-09-15 11:12 ` Markus Armbruster
2015-09-16 5:59 ` Wen Congyang
2015-09-16 8:21 ` Markus Armbruster
2015-09-16 8:24 ` Wen Congyang
2015-09-16 11:18 ` Markus Armbruster
2015-09-16 14:53 ` [Qemu-devel] [Qemu-block] " Eric Blake
2015-09-17 1:06 ` Wen Congyang
2015-09-17 1:04 ` [Qemu-devel] " Wen Congyang
2015-09-17 5:01 ` Markus Armbruster
2015-09-15 13:03 ` Eric Blake
2015-09-15 13:26 ` Kevin Wolf
2015-09-15 2:20 ` Wen Congyang
2015-09-15 2:27 ` Wen Congyang
2015-09-15 3:46 ` Eric Blake
2015-09-15 3:58 ` Wen Congyang
2015-09-15 13:11 ` Eric Blake
2015-09-16 7:11 ` Wen Congyang
2015-09-16 14:55 ` Eric Blake
2015-09-10 9:55 ` Wen Congyang [this message]
2015-09-10 9:55 ` [Qemu-devel] [PATCH v3 3/5] quorum: implement bdrv_add_child() and bdrv_del_child() Wen Congyang
2015-09-10 9:55 ` [Qemu-devel] [PATCH v3 4/5] qmp: add monitor command to add/remove a child Wen Congyang
2015-09-10 10:04 ` Daniel P. Berrange
2015-09-10 10:34 ` Wen Congyang
2015-09-14 14:36 ` Markus Armbruster
2015-09-14 15:34 ` Kevin Wolf
2015-09-14 16:09 ` Markus Armbruster
2015-09-15 2:40 ` Wen Congyang
2015-09-15 7:49 ` Markus Armbruster
2015-09-15 7:57 ` Wen Congyang
2015-09-16 6:31 ` Wen Congyang
2015-09-16 8:29 ` Markus Armbruster
2015-09-14 15:37 ` Kevin Wolf
2015-09-15 2:33 ` Wen Congyang
2015-09-15 8:56 ` Alberto Garcia
2015-09-15 9:20 ` Kevin Wolf
2015-09-15 9:26 ` [Qemu-devel] [Qemu-block] " Kevin Wolf
2015-09-10 9:55 ` [Qemu-devel] [PATCH v3 5/5] hmp: " Wen Congyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441878905-5272-3-git-send-email-wency@cn.fujitsu.com \
--to=wency@cn.fujitsu.com \
--cc=arei.gonglei@huawei.com \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=eddie.dong@intel.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=yanghy@cn.fujitsu.com \
--cc=yunhong.jiang@intel.com \
--cc=zhang.zhanghailiang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.