From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EADBC47096 for ; Thu, 3 Jun 2021 20:58:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0B90613AE for ; Thu, 3 Jun 2021 20:57:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0B90613AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1louPe-0006jk-QT for qemu-devel@archiver.kernel.org; Thu, 03 Jun 2021 16:57:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1louOy-0005vk-EK for qemu-devel@nongnu.org; Thu, 03 Jun 2021 16:57:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1louOx-0003hW-19 for qemu-devel@nongnu.org; Thu, 03 Jun 2021 16:57:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622753834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JyRo9UzcMCKt0PVGyvPFStXiZyV8fWqNeLiyoK5b6y0=; b=MxfkGqpgWOv4xNlc/cmV21euDNh6J3UYJy1gVoHaSldMfFi1M3aODovNq6jcw+mPjrv/Ut MhYy1nvXtQrgLIZZXZJZPDj9bxPSts22hcLmrS2YUjX3gyDBjwVXHhIQxBNNCpS76z1hQU CGPuX7h9GnG6kouf4wAbUU2kgSlYKJg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-XqXiANT3M6G40O8WsDbL3A-1; Thu, 03 Jun 2021 16:57:10 -0400 X-MC-Unique: XqXiANT3M6G40O8WsDbL3A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47353107ACC7; Thu, 3 Jun 2021 20:57:09 +0000 (UTC) Received: from redhat.com (ovpn-113-53.phx2.redhat.com [10.3.113.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9727C5DEAD; Thu, 3 Jun 2021 20:57:08 +0000 (UTC) Date: Thu, 3 Jun 2021 15:57:06 -0500 From: Eric Blake To: Vladimir Sementsov-Ogievskiy Subject: Re: [PATCH v3 30/33] block/nbd: reuse nbd_co_do_establish_connection() in nbd_open() Message-ID: <20210603205706.p3uxzkby3jwdkl3l@redhat.com> References: <20210416080911.83197-1-vsementsov@virtuozzo.com> <20210416080911.83197-31-vsementsov@virtuozzo.com> MIME-Version: 1.0 In-Reply-To: <20210416080911.83197-31-vsementsov@virtuozzo.com> User-Agent: NeoMutt/20210205 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.37, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com, rvkagan@yandex-team.ru, den@openvz.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Apr 16, 2021 at 11:09:08AM +0300, Vladimir Sementsov-Ogievskiy wrote: > The only last step we need to reuse the function is coroutine-wrapper. > nbd_open() may be called from non-coroutine context. So, generate the > wrapper and use it. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > block/coroutines.h | 6 +++ > block/nbd.c | 101 ++------------------------------------------- > 2 files changed, 10 insertions(+), 97 deletions(-) > > diff --git a/block/coroutines.h b/block/coroutines.h > index 4cfb4946e6..514d169d23 100644 > --- a/block/coroutines.h > +++ b/block/coroutines.h > @@ -66,4 +66,10 @@ int coroutine_fn bdrv_co_readv_vmstate(BlockDriverState *bs, > int coroutine_fn bdrv_co_writev_vmstate(BlockDriverState *bs, > QEMUIOVector *qiov, int64_t pos); > > +int generated_co_wrapper > +nbd_do_establish_connection(BlockDriverState *bs, Error **errp); > +int coroutine_fn > +nbd_co_do_establish_connection(BlockDriverState *bs, Error **errp); Tagged coroutine_fn here,... > +++ b/block/nbd.c > > -static int nbd_co_do_establish_connection(BlockDriverState *bs, Error **errp) > +int nbd_co_do_establish_connection(BlockDriverState *bs, Error **errp) ...but not here. Is it worth being consistent? > @@ -2056,22 +1974,11 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags, > s->x_dirty_bitmap, s->tlscreds, > monitor_cur()); > > - /* > - * establish TCP connection, return error if it fails > - * TODO: Configurable retry-until-timeout behaviour. > - */ > - sioc = nbd_establish_connection(bs, s->saddr, errp); > - if (!sioc) { > - ret = -ECONNREFUSED; > - goto fail; > - } > - > - ret = nbd_client_handshake(bs, sioc, errp); > + /* TODO: Configurable retry-until-timeout behaviour.*/ Space before */ Nice diffstat, proving the refactoring worked. Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org