From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5VSP-0004uN-6Y for qemu-devel@nongnu.org; Thu, 18 Jun 2015 04:45:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5VSO-0004Ba-CL for qemu-devel@nongnu.org; Thu, 18 Jun 2015 04:45:57 -0400 From: Wen Congyang Date: Thu, 18 Jun 2015 16:49:15 +0800 Message-ID: <1434617361-17778-11-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1434617361-17778-1-git-send-email-wency@cn.fujitsu.com> References: <1434617361-17778-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Block v6 10/16] NBD client: connect to nbd server later List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini Cc: Kevin Wolf , qemu block , Lai Jiangshan , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Stefan Hajnoczi , Yang Hongyang , zhanghailiang The secondary qemu starts later than the primary qemu, so we cannot connect to nbd server in bdrv_open(). Introduce a new open flags to control it. Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei --- block/nbd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index bc9477a..4964cf8 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -298,11 +298,13 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags, return -EINVAL; } - nbd_connect_server(bs, &local_err); - if (local_err) { - error_propagate(errp, local_err); - g_free(s->export); - return -EINVAL; + if (!(flags & BDRV_O_NO_CONNECT)) { + nbd_connect_server(bs, &local_err); + if (local_err) { + error_propagate(errp, local_err); + g_free(s->export); + return -EINVAL; + } } return 0; -- 2.4.3