From patchwork Fri May 8 09:16:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 469944 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 28B18140283 for ; Fri, 8 May 2015 19:17:45 +1000 (AEST) Received: from localhost ([::1]:54262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqePf-00022a-28 for incoming@patchwork.ozlabs.org; Fri, 08 May 2015 05:17:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqeKs-0002Da-36 for qemu-devel@nongnu.org; Fri, 08 May 2015 05:12:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqeKm-0004Ya-Bj for qemu-devel@nongnu.org; Fri, 08 May 2015 05:12:45 -0400 Received: from [59.151.112.132] (port=9387 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqeKl-0004Pe-QD; Fri, 08 May 2015 05:12:40 -0400 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="91868062" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 08 May 2015 17:08:40 +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 t489BG5J015711; Fri, 8 May 2015 17:11:16 +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, 8 May 2015 17:12:35 +0800 From: Wen Congyang To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini Date: Fri, 8 May 2015 17:16:00 +0800 Message-ID: <1431076567-30371-9-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431076567-30371-1-git-send-email-wency@cn.fujitsu.com> References: <1431076567-30371-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 , Lai Jiangshan , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Stefan Hajnoczi , Yang Hongyang , zhanghailiang Subject: [Qemu-devel] [PATCH COLO v4 08/15] NBD client: implement block driver interfaces to connect/disconnect NBD server 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 --- block/nbd.c | 65 ++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 2176186..0624232 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -44,6 +44,8 @@ typedef struct BDRVNBDState { NbdClientSession client; QemuOpts *socket_opts; + char *export; + bool connected; } BDRVNBDState; static int nbd_parse_uri(const char *filename, QDict *options) @@ -254,34 +256,55 @@ static int nbd_establish_connection(BlockDriverState *bs, Error **errp) return sock; } -static int nbd_open(BlockDriverState *bs, QDict *options, int flags, - Error **errp) +static void nbd_connect_server(BlockDriverState *bs, Error **errp) { BDRVNBDState *s = bs->opaque; - char *export = NULL; - int result, sock; - Error *local_err = NULL; - - /* Pop the config into our state object. Exit if invalid. */ - nbd_config(s, options, &export, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return -EINVAL; - } + int sock; /* establish TCP connection, return error if it fails * TODO: Configurable retry-until-timeout behaviour. */ sock = nbd_establish_connection(bs, errp); if (sock < 0) { - g_free(export); - return sock; + return; } /* NBD handshake */ - result = nbd_client_init(bs, sock, export, errp); - g_free(export); - return result; + nbd_client_init(bs, sock, s->export, errp); + + s->connected = true; +} + +static void nbd_disconnect_server(BlockDriverState *bs) +{ + BDRVNBDState *s = bs->opaque; + + if (s->connected) { + nbd_client_close(bs); + s->connected = false; + } +} + +static int nbd_open(BlockDriverState *bs, QDict *options, int flags, + Error **errp) +{ + BDRVNBDState *s = bs->opaque; + Error *local_err = NULL; + + /* Pop the config into our state object. Exit if invalid. */ + nbd_config(s, options, &s->export, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + + nbd_connect_server(bs, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + + return 0; } static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num, @@ -318,7 +341,7 @@ static void nbd_close(BlockDriverState *bs) BDRVNBDState *s = bs->opaque; qemu_opts_del(s->socket_opts); - nbd_client_close(bs); + nbd_disconnect_server(bs); } static int64_t nbd_getlength(BlockDriverState *bs) @@ -400,6 +423,8 @@ static BlockDriver bdrv_nbd = { .bdrv_detach_aio_context = nbd_detach_aio_context, .bdrv_attach_aio_context = nbd_attach_aio_context, .bdrv_refresh_filename = nbd_refresh_filename, + .bdrv_connect = nbd_connect_server, + .bdrv_disconnect = nbd_disconnect_server, }; static BlockDriver bdrv_nbd_tcp = { @@ -418,6 +443,8 @@ static BlockDriver bdrv_nbd_tcp = { .bdrv_detach_aio_context = nbd_detach_aio_context, .bdrv_attach_aio_context = nbd_attach_aio_context, .bdrv_refresh_filename = nbd_refresh_filename, + .bdrv_connect = nbd_connect_server, + .bdrv_disconnect = nbd_disconnect_server, }; static BlockDriver bdrv_nbd_unix = { @@ -436,6 +463,8 @@ static BlockDriver bdrv_nbd_unix = { .bdrv_detach_aio_context = nbd_detach_aio_context, .bdrv_attach_aio_context = nbd_attach_aio_context, .bdrv_refresh_filename = nbd_refresh_filename, + .bdrv_connect = nbd_connect_server, + .bdrv_disconnect = nbd_disconnect_server, }; static void bdrv_nbd_init(void)