From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqeKo-00026q-Px for qemu-devel@nongnu.org; Fri, 08 May 2015 05:12:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqeKn-0004bF-E3 for qemu-devel@nongnu.org; Fri, 08 May 2015 05:12:42 -0400 From: Wen Congyang Date: Fri, 8 May 2015 17:16:02 +0800 Message-ID: <1431076567-30371-11-git-send-email-wency@cn.fujitsu.com> 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 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO v4 10/15] 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 0624232..e1a04bb 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -298,10 +298,12 @@ 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); - return -EINVAL; + if (!(flags & BDRV_O_NO_CONNECT)) { + nbd_connect_server(bs, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } } return 0; -- 2.1.0