From nobody Fri Nov 14 21:05:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1760615175; cv=none; d=zohomail.com; s=zohoarc; b=XFoTDnkGDYZ6yJecgiD2SmxV6NRsjXPgWCMsAHNaLYQ/Dr3buQmNfL0ySIG5di7JXLiBf3zPtJOUsv9/H7q5X/nLSP2Vx3SYRETVsx8XsFBT2XGvwopk/EftkQUEav1om27wiJlYD836nsGEeWxaVpPNhg5I4YixoSFJV0eeLa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760615175; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=s9yCrQBHmEqUJP+BAtrGs9xnsIszRjeHBLrqv/k9/kY=; b=YQBKHI3kH1G8ulCLsQV9k1rxkkNhjPufSxDRwfy26UaMPgsn7mgtIm6LuaKuxODcKhXSiQSO6NfE22vv19UJorWaxI4WiKrppeVIfNmnQjfsT/q+pqcO4ti6zIUfDB04ENtoB3zfpbaEstk1vhaSfzLwK5vAiwskNxUI6Q4VLzU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760615175976177.5264286109316; Thu, 16 Oct 2025 04:46:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9MNW-0007O3-CG; Thu, 16 Oct 2025 07:42:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9MMm-00077W-5Q; Thu, 16 Oct 2025 07:41:57 -0400 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9MMa-0003V1-UX; Thu, 16 Oct 2025 07:41:52 -0400 Received: from mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:3a87:0:640:845c:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id A45E8C01C0; Thu, 16 Oct 2025 14:41:31 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:a8c::1:19]) by mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id LfP2M73FEmI0-kbTFYAzO; Thu, 16 Oct 2025 14:41:31 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1760614891; bh=s9yCrQBHmEqUJP+BAtrGs9xnsIszRjeHBLrqv/k9/kY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=nGMFivfrKNwEYIg4qwdqbFWpAbeT2qjkF2VfBM6/5cHP4iADYxGoBuyFaeYKhyjCE nTuClrPtD2w8Gm2KvZ4UojN8fA31c+j9bTunxgzi2ta2nXtoE9VELDvlS43fuq4mq2 aKRDhC38KQ64KEkYt2XCUupg+hX9++fFFxuTvOhs= Authentication-Results: mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: raphael@enfabrica.net, pbonzini@redhat.com, farosas@suse.de Cc: mst@redhat.com, sgarzare@redhat.com, marcandre.lureau@redhat.com, kwolf@redhat.com, hreitz@redhat.com, berrange@redhat.com, eblake@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, steven.sistare@oracle.com, vsementsov@yandex-team.ru, yc-core@yandex-team.ru, d-tatianin@yandex-team.ru, jasowang@redhat.com Subject: [PATCH v2 10/25] vhost-user-blk: split vhost_user_blk_init() Date: Thu, 16 Oct 2025 14:40:47 +0300 Message-ID: <20251016114104.1384675-11-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251016114104.1384675-1-vsementsov@yandex-team.ru> References: <20251016114104.1384675-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a02:6b8:c0e:500:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1760615181241158500 Content-Type: text/plain; charset="utf-8" Split it into _init() and _connect() part, following pattern of vhost_dev_init / vhost_dev_connect. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Raphael Norwitz --- hw/block/vhost-user-blk.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index c31c265a0e..9c727c3977 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -58,6 +58,7 @@ static const int user_feature_bits[] =3D { }; =20 static void vhost_user_blk_event(void *opaque, QEMUChrEvent event); +static int vhost_user_blk_connect(DeviceState *dev, Error **errp); =20 static void vhost_user_blk_update_config(VirtIODevice *vdev, uint8_t *conf= ig) { @@ -352,9 +353,6 @@ static int vhost_user_blk_init(DeviceState *dev, bool c= onnect, Error **errp) =20 trace_vhost_user_blk_init_in(vdev); =20 - /* TODO: implement support for connect=3Dfalse */ - assert(connect); - assert(!s->connected); =20 s->dev.num_queues =3D s->num_queues; @@ -371,6 +369,29 @@ static int vhost_user_blk_init(DeviceState *dev, bool = connect, Error **errp) return ret; } =20 + if (connect) { + ret =3D vhost_user_blk_connect(dev, errp); + if (ret < 0) { + return ret; + } + } + + trace_vhost_user_blk_init_out(vdev); + + return 0; +} + +static int vhost_user_blk_connect(DeviceState *dev, + Error **errp) +{ + VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); + VHostUserBlk *s =3D VHOST_USER_BLK(vdev); + int ret =3D 0; + + trace_vhost_user_blk_connect_in(vdev); + + assert(!s->connected); + ret =3D vhost_dev_connect(&s->dev, errp); if (ret < 0) { return ret; --=20 2.48.1