From nobody Mon Nov 10 10:14:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1555003761; cv=none; d=zoho.com; s=zohoarc; b=ZndVjf3IvhbMPygMc6FjY4yiiful2RoE7L8xhzwC/tSmeLRCzRz4WYM8xHKbwh3Oe87ywnPshx0WfWbxsxv4eoZSE18iylh9ke6u007Jq0F2Eb3Do+ofyi3EaixAliR8CqU5gCuD52LxcfOJb3MFCTov/5PP9jZpt+rI0Ua/y/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555003761; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=658Vxf35KUWNVSHeJ5Vk99xVI64/ErWrKn5x3aXAqQs=; b=BheQok0ZBBlVSEG7F8fs8B/XcX8cYPtT/dRjq6BbdbH3y8InYqKzbM+X9hLPnAqanZKCEh5o8Vw40pG/Ceidhyv3RPdvTNOizScO4Qt3XvNo8ZPliCUGmeGDyHv2y1Fd7RbRK0Cz7pijlRIcruHRFskRZD2G67cVi10nImBL4WU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555003761213434.71067692274437; Thu, 11 Apr 2019 10:29:21 -0700 (PDT) Received: from localhost ([127.0.0.1]:52547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEdVf-0005iw-Kr for importer@patchew.org; Thu, 11 Apr 2019 13:29:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEdTm-0004ZF-Nu for qemu-devel@nongnu.org; Thu, 11 Apr 2019 13:27:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEdTl-0003bQ-Mk for qemu-devel@nongnu.org; Thu, 11 Apr 2019 13:27:14 -0400 Received: from relay.sw.ru ([185.231.240.75]:59364) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEdTl-0003Zz-CA; Thu, 11 Apr 2019 13:27:13 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hEdTi-00044D-Af; Thu, 11 Apr 2019 20:27:10 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 11 Apr 2019 20:27:03 +0300 Message-Id: <20190411172709.205032-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190411172709.205032-1-vsementsov@virtuozzo.com> References: <20190411172709.205032-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v6 1/7] block/nbd-client: split connection_co start out of nbd_client_connect X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" nbd_client_connect is going to be used from connection_co, so, let's refactor nbd_client_connect in advance, leaving io channel configuration all in nbd_client_connect. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd-client.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 790ecc1ee1..facf8f8099 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -1180,12 +1180,8 @@ static int nbd_client_connect(BlockDriverState *bs, object_ref(OBJECT(client->ioc)); } =20 - /* Now that we're connected, set the socket to be non-blocking and - * kick the reply mechanism. */ qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL); - client->connection_co =3D qemu_coroutine_create(nbd_connection_entry, = client); - bdrv_inc_in_flight(bs); - nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs)); + qio_channel_attach_aio_context(client->ioc, bdrv_get_aio_context(bs)); =20 logout("Established connection with NBD server\n"); return 0; @@ -1215,12 +1211,22 @@ int nbd_client_init(BlockDriverState *bs, const char *x_dirty_bitmap, Error **errp) { + int ret; NBDClientSession *client =3D nbd_get_client_session(bs); =20 client->bs =3D bs; qemu_co_mutex_init(&client->send_mutex); qemu_co_queue_init(&client->free_sema); =20 - return nbd_client_connect(bs, saddr, export, tlscreds, hostname, - x_dirty_bitmap, errp); + ret =3D nbd_client_connect(bs, saddr, export, tlscreds, hostname, + x_dirty_bitmap, errp); + if (ret < 0) { + return ret; + } + + client->connection_co =3D qemu_coroutine_create(nbd_connection_entry, = client); + bdrv_inc_in_flight(bs); + aio_co_schedule(bdrv_get_aio_context(bs), client->connection_co); + + return 0; } --=20 2.18.0