From patchwork Fri Jul 31 09:19:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 502448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D156B140332 for ; Fri, 31 Jul 2015 19:19:59 +1000 (AEST) Received: from localhost ([::1]:43659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZL6Tt-0001je-Vy for incoming@patchwork.ozlabs.org; Fri, 31 Jul 2015 05:19:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZL6TR-0000qU-Bv for qemu-devel@nongnu.org; Fri, 31 Jul 2015 05:19:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZL6TP-0006js-4H for qemu-devel@nongnu.org; Fri, 31 Jul 2015 05:19:29 -0400 Received: from [59.151.112.132] (port=33300 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZL6TO-0006hu-6r; Fri, 31 Jul 2015 05:19:27 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="99117522" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 31 Jul 2015 17:22:49 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t6V9HO50006224; Fri, 31 Jul 2015 17:17:24 +0800 Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 31 Jul 2015 17:19:15 +0800 From: Wen Congyang To: qemu devel , Eric Blake , Markus Armbruster , Alberto Garcia , Stefan Hajnoczi Date: Fri, 31 Jul 2015 17:19:12 +0800 Message-ID: <1438334355-26914-4-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438334355-26914-1-git-send-email-wency@cn.fujitsu.com> References: <1438334355-26914-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Kevin Wolf , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Yang Hongyang , zhanghailiang Subject: [Qemu-devel] [PATCH for-2.5 3/6] Add new block driver interface to add/delete a BDS's child X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In some cases, we want to take a quorum child offline, and take another child online. Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei Reviewed-by: Alberto Garcia --- block.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 4 ++++ include/block/block_int.h | 5 +++++ 3 files changed, 61 insertions(+) diff --git a/block.c b/block.c index d088ee0..934a32d 100644 --- a/block.c +++ b/block.c @@ -4251,3 +4251,55 @@ BlockAcctStats *bdrv_get_stats(BlockDriverState *bs) { return &bs->stats; } + +static const char *bdrv_get_id_or_node_name(BlockDriverState *bs) +{ + if (bs->blk) { + return blk_name(bs->blk); + } + + return bs->node_name ? bs->node_name : ""; +} + +/* + * 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 *bs, QDict *options, Error **errp) +{ + + if (!bs->drv || !bs->drv->bdrv_add_child) { + error_setg(errp, "The BDS %s doesn't support adding a child", + bdrv_get_id_or_node_name(bs)); + return; + } + + bs->drv->bdrv_add_child(bs, options, errp); +} + +void bdrv_del_child(BlockDriverState *bs, BlockDriverState *child_bs, + Error **errp) +{ + BdrvChild *child; + + if (!bs->drv || !bs->drv->bdrv_del_child) { + error_setg(errp, "The BDS %s doesn't support removing a child", + bdrv_get_id_or_node_name(bs)); + return; + } + + QLIST_FOREACH(child, &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_id_or_node_name(child_bs), + bdrv_get_id_or_node_name(bs)); + return; + } + + bs->drv->bdrv_del_child(bs, child_bs, errp); +} diff --git a/include/block/block.h b/include/block/block.h index 37916f7..4a03fb6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -616,4 +616,8 @@ void bdrv_flush_io_queue(BlockDriverState *bs); BlockAcctStats *bdrv_get_stats(BlockDriverState *bs); +void bdrv_add_child(BlockDriverState *bs, QDict *options, Error **errp); +void bdrv_del_child(BlockDriverState *bs, BlockDriverState *child, + Error **errp); + #endif diff --git a/include/block/block_int.h b/include/block/block_int.h index 14ad4c3..b6f2905 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 *bs, QDict *options, + Error **errp); + void (*bdrv_del_child)(BlockDriverState *bs, BlockDriverState *child, + Error **errp); + QLIST_ENTRY(BlockDriver) list; };