From nobody Fri Nov 14 21:05:53 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=1760615079; cv=none; d=zohomail.com; s=zohoarc; b=bPxgKyi0t2RBN0H7NwWV/a80vVrK9+U/w1Ln8/0zB7UifMxADsVBc71lMGeA48lCdQrcYqD8ZWrVPfdfgs8V4wFC0OR3SuK4YGGvZ6Y56YRhMCiIKHNzpyN9NSDSixdfvmn7EbAmCz0p16f82NtfB2kGyWD+lWeOQj0mmsHw5xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760615079; 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=3Rz+MXzzYC9OgDI+uA/Nsz/cK/rJU7nqiFJFVGluT4g=; b=UTcO0Hy1yN0Vgu3YfDfH9wSThrM3VoUp3mNcQyniVKu7p9V9lYQC0TXBa6RJiSKzUKnmzpGGoBIflowTARQOUmG8+LB5FCdmXlTrp0m2m9FpyM+Olyp5jelX8uoyDFMkk3vmGPfm2F5LLVWe/HIrh4RmHQyZCnOKIz6QhPH/5V4= 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 1760615079219450.06854842751966; Thu, 16 Oct 2025 04:44:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9MNc-0007UJ-8d; Thu, 16 Oct 2025 07:42:48 -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 1v9MMh-00076q-Uq; Thu, 16 Oct 2025 07:41:52 -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 1v9MMS-0003Tj-CU; Thu, 16 Oct 2025 07:41:46 -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 9BF02C01C8; Thu, 16 Oct 2025 14:41:29 +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-8uCyA1Hn; Thu, 16 Oct 2025 14:41:29 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1760614889; bh=3Rz+MXzzYC9OgDI+uA/Nsz/cK/rJU7nqiFJFVGluT4g=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=k8DeWtLalt45sEpF4NnXdUFO9fIJwFvKKK50gyo1msyp0vuRBV/eHzoQCGMTC4Gbv vNM2NhbnIArh3dpCbOSrhxENkZGW41kopIVBxTzr05rVI8kmPi3FxQhS1E1Wt0CADA r9cveRYp/fBi8opR2QJp6cF/6TIPiaqpQlRisqRU= 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 07/25] vhost-user-blk: vhost_user_blk_connect() move connected check to caller Date: Thu, 16 Oct 2025 14:40:44 +0300 Message-ID: <20251016114104.1384675-8-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: 1760615081769154100 Content-Type: text/plain; charset="utf-8" vhost_user_blk_connect() has two callers: - vhost_user_blk_realize_connect(), which directly set .connected =3D false before call - vhost_user_blk_event(), where we want this check Move the check to the only caller which needs it, to simplify further refactoring. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Raphael Norwitz --- hw/block/vhost-user-blk.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index a92426f18c..57214a69cd 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -352,9 +352,7 @@ static int vhost_user_blk_connect(DeviceState *dev, Err= or **errp) =20 trace_vhost_user_blk_connect_in(vdev); =20 - if (s->connected) { - return 0; - } + assert(!s->connected); =20 s->dev.num_queues =3D s->num_queues; s->dev.nvqs =3D s->num_queues; @@ -411,10 +409,12 @@ static void vhost_user_blk_event(void *opaque, QEMUCh= rEvent event) =20 switch (event) { case CHR_EVENT_OPENED: - if (vhost_user_blk_connect(dev, &local_err) < 0) { - error_report_err(local_err); - qemu_chr_fe_disconnect(&s->chardev); - return; + if (!s->connected) { + if (vhost_user_blk_connect(dev, &local_err) < 0) { + error_report_err(local_err); + qemu_chr_fe_disconnect(&s->chardev); + return; + } } break; case CHR_EVENT_CLOSED: --=20 2.48.1