From patchwork Wed Dec 2 05:31:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 551178 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 774DE14029E for ; Wed, 2 Dec 2015 16:36:57 +1100 (AEDT) Received: from localhost ([::1]:56321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4063-0006cG-HV for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2015 00:36:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a402Z-0000oN-Fx for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:33:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a402Y-0002Wh-Bd for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:33:19 -0500 Received: from [59.151.112.132] (port=44705 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a402U-0002VP-R4; Wed, 02 Dec 2015 00:33:15 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="1071967" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 02 Dec 2015 13:33:00 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id CC95341890F6; Wed, 2 Dec 2015 13:32:53 +0800 (CST) Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 2 Dec 2015 13:32:53 +0800 From: Wen Congyang To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini , Kevin Wolf , Stefan Hajnoczi Date: Wed, 2 Dec 2015 13:31:47 +0800 Message-ID: <1449034311-4094-7-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1449034311-4094-1-git-send-email-wency@cn.fujitsu.com> References: <1449034311-4094-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-yoursite-MailScanner-Information: Please contact the ISP for more information X-yoursite-MailScanner-ID: CC95341890F6.A6CB9 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: wency@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , "Michael R. Hines" , Luiz Capitulino , Gonglei , Michael Roth , zhanghailiang Subject: [Qemu-devel] [Patch v12 resend 06/10] Add new block driver interfaces to control block replication 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 Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei Cc: Luiz Capitulino Cc: Michael Roth Reviewed-by: Paolo Bonzini --- block.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 5 +++++ include/block/block_int.h | 14 ++++++++++++++ qapi/block-core.json | 13 +++++++++++++ 4 files changed, 75 insertions(+) diff --git a/block.c b/block.c index 0a0468f..213bee8 100644 --- a/block.c +++ b/block.c @@ -4390,3 +4390,46 @@ void bdrv_del_child(BlockDriverState *parent_bs, BlockDriverState *child_bs, parent_bs->drv->bdrv_del_child(parent_bs, child_bs, errp); } + +void bdrv_start_replication(BlockDriverState *bs, ReplicationMode mode, + Error **errp) +{ + BlockDriver *drv = bs->drv; + + if (drv && drv->bdrv_start_replication) { + drv->bdrv_start_replication(bs, mode, errp); + } else if (bs->file) { + bdrv_start_replication(bs->file->bs, mode, errp); + } else { + error_setg(errp, "The BDS %s doesn't support starting block" + " replication", bs->filename); + } +} + +void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp) +{ + BlockDriver *drv = bs->drv; + + if (drv && drv->bdrv_do_checkpoint) { + drv->bdrv_do_checkpoint(bs, errp); + } else if (bs->file) { + bdrv_do_checkpoint(bs->file->bs, errp); + } else { + error_setg(errp, "The BDS %s doesn't support block checkpoint", + bs->filename); + } +} + +void bdrv_stop_replication(BlockDriverState *bs, bool failover, Error **errp) +{ + BlockDriver *drv = bs->drv; + + if (drv && drv->bdrv_stop_replication) { + drv->bdrv_stop_replication(bs, failover, errp); + } else if (bs->file) { + bdrv_stop_replication(bs->file->bs, failover, errp); + } else { + error_setg(errp, "The BDS %s doesn't support stopping block" + " replication", bs->filename); + } +} diff --git a/include/block/block.h b/include/block/block.h index 1d3b9c6..cd39d50 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -648,4 +648,9 @@ void bdrv_add_child(BlockDriverState *parent, BlockDriverState *child, void bdrv_del_child(BlockDriverState *parent, BlockDriverState *child, Error **errp); +void bdrv_start_replication(BlockDriverState *bs, ReplicationMode mode, + Error **errp); +void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp); +void bdrv_stop_replication(BlockDriverState *bs, bool failover, Error **errp); + #endif diff --git a/include/block/block_int.h b/include/block/block_int.h index 1f56046..a6aba8b 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -307,6 +307,20 @@ struct BlockDriver { void (*bdrv_del_child)(BlockDriverState *parent, BlockDriverState *child, Error **errp); + void (*bdrv_start_replication)(BlockDriverState *bs, ReplicationMode mode, + Error **errp); + /* Drop Disk buffer when doing checkpoint. */ + void (*bdrv_do_checkpoint)(BlockDriverState *bs, Error **errp); + /* + * After failover, we should flush Disk buffer into secondary disk + * and stop block replication. + * + * If the guest is shutdown, we should drop Disk buffer and stop + * block representation. + */ + void (*bdrv_stop_replication)(BlockDriverState *bs, bool failover, + Error **errp); + QLIST_ENTRY(BlockDriver) list; }; diff --git a/qapi/block-core.json b/qapi/block-core.json index feb8da2..2c6bd3f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1925,6 +1925,19 @@ '*read-pattern': 'QuorumReadPattern' } } ## +# @ReplicationMode +# +# An enumeration of replication modes. +# +# @primary: Primary mode, the vm's state will be sent to secondary QEMU. +# +# @secondary: Secondary mode, receive the vm's state from primary QEMU. +# +# Since: 2.5 +## +{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] } + +## # @BlockdevOptions # # Options for creating a block device.