From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11023119.outbound.protection.outlook.com [52.101.83.119]) by lore.virtuozzo.com (Postfix) with ESMTPS id 67DB780E7E for ; Thu, 29 Oct 2026 09:23:10 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=foI5z6JXjC+WGNigDzL2Y6fcdrc1qKW/cyr8P5HiaqK5TkAj3HMnanq4ijAJeybZjpuPLxs5x7eH0vj4jZd+Y5jMGBRjBJMJrhP+yKdDTPZyNEH5zhCAKyOHLaX7mifkQdytJGpeKYS6jZNjV4d0XPHCZg75vs9FlwSKQlXcqZl9t5PtSLjhAIuAVlZUth40YURaxpLW5YPcrxNSM1E4DVWmwfY6tpmkiS1bn5CIXiiQz75DnB3Td1iTSS7FpYAjBF75/hrbzpDYzCiP7p+tNjrwo8041XZ0WuT4Rr5Xn5R2XWQE6xLWBXwjzZhDqli/AcX/ztlWB7ITuC6sLo08Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9ziUejL8lk8V8wU1UOI1PQZZKAx7fBQ8Ivzm3GnE2+Q=; b=FoYK4N6R0GZF0KRCJ9oAIHWFRHobhb1H2iA447NfakH30zQGZla74ZWZXatzwZ3zQ7fwWsITcIZ6AWBPIFvtV9TZ6th05mu9uUIAoUkD8065M/L5ZIs7y3rRG0oZa8ELkkbZFmJvsT1qDZcK8oHfuStKVfK3t3ivtFImstKqhFDdpZnlHqQKS+ToZHIvXtWZPqN1agEbnE8h8RTD+YMwAwJk63Ic8TGd3/w71ibmCKS0icYHITmT7WgAJrNf+lMjJd1LPlUeaHGbzXd81ycS/nRl8Wjhbuk7aejdXmVLS266T6x7zEOzxOCD1JjiooDSNWWIHwrVqe1pH5LgWZWwYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 130.117.225.111) smtp.rcpttodomain=virtuozzo.com smtp.mailfrom=virtuozzo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=virtuozzo.com; dkim=pass (signature was verified) header.d=virtuozzo.com; arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9ziUejL8lk8V8wU1UOI1PQZZKAx7fBQ8Ivzm3GnE2+Q=; b=JQuztMIydH8M1aAG2h3S4++/npMUgbu41g0z8QnZSMvrMCGB3QRsZQ5QCbCM/YtjTfqMmjWVb9q6iH3PLf5NIuSmTtfpwtr14n+EYgEhqkHRdF44LjcuMbmnfkOFpkdaCTgyPwDbFhS+amZEEmf8Yrsds0dyS7EO7au+zwkbANC1dvEyu32utTZDSWBbqcikW3k95zBW06CpK6dvDPkVRkCOZUhNMTaL+fXUt9oVcFRBGQpU1v/fdun9NC4eeK0cicb8HajNETLjBXrwaxjUDvBit9BUbzs4vSy3tUvkBziL1P+Kff7nCeVx8ycGuupQCIdriID1NFbfP3DEfnWQNw== Received: from AS9PR05CA0058.eurprd05.prod.outlook.com (2603:10a6:20b:489::32) by DB9PR08MB11921.eurprd08.prod.outlook.com (2603:10a6:10:614::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.22; Thu, 29 Oct 2026 09:23:08 +0000 Received: from AM2PEPF00070CF3.eurprd02.prod.outlook.com (2603:10a6:20b:489:cafe::9a) by AS9PR05CA0058.outlook.office365.com (2603:10a6:20b:489::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.569.8 via Frontend Transport; Thu, 29 Oct 2026 09:23:07 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 130.117.225.111) smtp.mailfrom=virtuozzo.com; dkim=pass (signature was verified) header.d=virtuozzo.com;dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 130.117.225.111 as permitted sender) receiver=protection.outlook.com; client-ip=130.117.225.111; helo=relay.virtuozzo.com; pr=C Received: from relay.virtuozzo.com (130.117.225.111) by AM2PEPF00070CF3.mail.protection.outlook.com (10.167.242.5) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.569.4 via Frontend Transport; Thu, 29 Oct 2026 09:23:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=9ziUejL8lk8V8wU1UOI1PQZZKAx7fBQ8Ivzm3GnE2+Q=; b=vdva1N0sCDkL cjC7mqZ1rqbv0m1BNenG4ytZ4GEsM6un/9463XtPs1dS/stP74AP0+ZUdFm8jEFntsct6vKraVwM5 8xC4vYYMyqOm9cLncCEzeizIeWkNGHlSYrNiBg1shJ0zNgkiOBL1cchsLRrvEe+M6rLKAB4exmvmj rpybTb2M3zPN7jcWIoUbZ+mNokNqBL6vIoa/mEot8b8kjxz/gnxE2qj8N+quZmh5/UfcF+IWBIWZU RyWXuKNrKN/33Ea1iewA0AJGEqsbdHuUj44pGj3FvIO23J1qR1Fjf0upjDwTFIivIvKuDTZPDf/d0 9Z6EkbZ8CQb/JZY4YB5Mww==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xMMHv-000QvD-0j; Thu, 29 Oct 2026 10:23:04 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, svt-core@virtuozzo.com Subject: [PATCH hci-8.1 v4 3/5] vhost-blk: use a local vhost_dev pointer in start and stop Date: Thu, 29 Oct 2026 10:22:59 +0100 Message-ID: <20261029092301.3286535-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261029092301.3286535-1-alexander.ivanov@virtuozzo.com> References: <20261029092301.3286535-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM2PEPF00070CF3:EE_|DB9PR08MB11921:EE_ X-MS-Office365-Filtering-Correlation-Id: 16756dd6-abd6-46b8-51de-08df359e3df0 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-Transport-Rules-Loop: 1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|36860700016|82310400026|1800799024|22082099003|18002099003|57112099003|5113699003|261021121427099003|261021123027099003|10067099003|261009223027099003; X-Microsoft-Antispam-Message-Info: D0qSXk06VHJSrelA6cadmhMbjxoBlyAJDCtdY3K8RyXqofHKt6q2WXK5WrfiPeVySH4OTRZUwNysznDN6WgqUkbSg7jKpty+h9EzaQkGWfPcvvA2xVCU2goBRjyB87brQYMObthrP07nWZdIaBFhErL7DZEzik3tgtYfe64jzncNhgHEMLIS95I67q51LlYlz4bdyGzFlfydrgQQBs4i6RIBfSndC72FpryQ0VmBrmsHSJtKEAxayohnCZc/ncphZgM9fKTMQjSDRnWyGAdTR7bIvCHTcQMKPyo2c40u+whEhjakv9OYat/ZWjEZn3YZazVFxa5GzRwH9eArNpOARqByO9eeWu5QxYeVIPFW7nDwGOeH282mAvSrrBu5Pl0FK9ic9G8Hup0CbPb5fR49gNKVayj1ql63YImtMb0CNmiC5rDIQ71Kxlmw1oxPv9m2ORdq5ytf3WWnmFN9JM2INcwM2qvakxTpGRCZ3GHvE1hcEVb5GtQr51ji7e8qzTI60Pb3T5DuMsOXcZQe17O40Wv3eW6/MEUuS3C60MGoVHqzGIAckb9GKPy4Noy0qtuRQE+0gCpdUwTnBQWAvYriPG0uLH+Bqj7Nc8Uyd+sPokymyHcL9lztneoaOvenrdQCW/q9OlR4O25oEKlbi3M9ZfryoZFxkfLEoBQXJXXvHwrH8h7NbFzLWdpqEgadPm/iUfKs4zwjMGT/06Lxs7R/lnBZHJTaigPFQ3Cch7PkJuE4H6dvbzV5qrOj/t684yUOrhFAGAtx/n2dXPOQOHGYxOD2wQib2pnYB6RWRl9o7KpUHcKa5qLVMsY0KnlY4+Kndu8TjIqMg2jMV4KcDRud9ZBAnbbi9Ok2YLakCEvh9E/7su79m2jG7RE7A3g29vuh X-Forefront-Antispam-Report: CIP:130.117.225.111;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:relay.virtuozzo.com;PTR:relay.virtuozzo.com;CAT:NONE;SFS:(13230040)(23010399003)(376014)(36860700016)(82310400026)(1800799024)(22082099003)(18002099003)(57112099003)(5113699003)(261021121427099003)(261021123027099003)(10067099003)(261009223027099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vJb7l6WH9qb2egN8MzvnFro7eHsmkB416BYP6bvusktUmtfL33GPwSzPKPzgWMMIomIGs9yzKERomMvFVHXlLdpDQQ4jKaMIzENScSjMp8xmIZ1LgjM++JkqHdBruBF3sB3xcGauCVhsiFp0CyTgm5PWT4SpMNmapOwDvzgtNECkU798tP+N1gPhXqzls6II1vsuVaW8ZOqrduXvir+CteZ1SA+USl2rFUtBPrt4znciulIJWDIczkFTIAA0w2v6EmOufOQXR91RkWS1iUIde8M8CKVvRrtc/CErZF0igAy3xpA+h4mE4B+IQF8qmcjApES1lf2ASfog2gZUP0xz07DqP/26+fUtnCrqN1cQo2nMSK3hyN96ITvGH/FzPj6FTFdfpEQ+L5A7HZ2GPK/UGK81DfQbq06ujCBnKO3kcRhdkz/xhNbJwU0JKBoHs/QQ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2026 09:23:07.0107 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16756dd6-abd6-46b8-51de-08df359e3df0 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f;Ip=[130.117.225.111];Helo=[relay.virtuozzo.com] X-MS-Exchange-CrossTenant-AuthSource: AM2PEPF00070CF3.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB11921 Take &s->dev once into hdev in vhost_blk_start() and vhost_blk_stop() instead of spelling it out at every use. No functional change. https://virtuozzo.atlassian.net/browse/VSTOR-107537 Fixes: 0ff3cb5ff28f ("block: add vhost-blk backend") Signed-off-by: Alexander Ivanov --- hw/block/vhost-blk.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index 8a015d54fa7..b3eb181ceae 100644 --- a/hw/block/vhost-blk.c +++ b/hw/block/vhost-blk.c @@ -36,6 +36,7 @@ static int vhost_blk_start(VirtIODevice *vdev) { VHostBlk *s = VHOST_BLK(vdev); + struct vhost_dev *hdev = &s->dev; struct vhost_vring_file backend; int ret, i, nworkers; BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev))); @@ -70,22 +71,22 @@ static int vhost_blk_start(VirtIODevice *vdev) } } - ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true); + ret = k->set_guest_notifiers(qbus->parent, hdev->nvqs, true); if (ret < 0) { error_report("vhost-blk: unable to bind guest notifiers"); return ret; } - ret = vhost_dev_enable_notifiers(&s->dev, vdev); + ret = vhost_dev_enable_notifiers(hdev, vdev); if (ret < 0) { error_report("vhost-blk: unable to enable dev notifiers: %s", strerror(errno)); goto err_set; } - s->dev.acked_features = vdev->guest_features & s->dev.features; + hdev->acked_features = vdev->guest_features & hdev->features; - ret = vhost_dev_start(&s->dev, vdev, false); + ret = vhost_dev_start(hdev, vdev, false); if (ret < 0) { error_report("vhost-blk: unable to start vhost dev"); goto err_disable; @@ -100,11 +101,11 @@ static int vhost_blk_start(VirtIODevice *vdev) goto err_stop; } - for (i = 0; i < s->dev.nvqs; i++) { - vhost_virtqueue_mask(&s->dev, vdev, i, false); + for (i = 0; i < hdev->nvqs; i++) { + vhost_virtqueue_mask(hdev, vdev, i, false); } - for (i = 0; i < s->dev.nvqs; i++) { + for (i = 0; i < hdev->nvqs; i++) { event_notifier_set(virtio_queue_get_host_notifier(virtio_get_queue(vdev, i))); } @@ -113,11 +114,11 @@ static int vhost_blk_start(VirtIODevice *vdev) return 0; err_stop: - vhost_dev_stop(&s->dev, vdev, false); + vhost_dev_stop(hdev, vdev, false); err_disable: - vhost_dev_disable_notifiers(&s->dev, vdev); + vhost_dev_disable_notifiers(hdev, vdev); err_set: - ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false); + ret = k->set_guest_notifiers(qbus->parent, hdev->nvqs, false); if (ret < 0) { error_report("vhost-blk: unable to unbind guest notifiers"); } @@ -131,6 +132,7 @@ static void vhost_blk_stop(VirtIODevice *vdev) BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev))); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); VHostBlk *s = VHOST_BLK(vdev); + struct vhost_dev *hdev = &s->dev; struct vhost_vring_file backend; int ret; @@ -138,11 +140,11 @@ static void vhost_blk_stop(VirtIODevice *vdev) return; } - ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false); + ret = k->set_guest_notifiers(qbus->parent, hdev->nvqs, false); if (ret < 0) { error_report("vhost-blk: unable to unbind guest notifiers"); } - vhost_dev_disable_notifiers(&s->dev, vdev); + vhost_dev_disable_notifiers(hdev, vdev); /* * Detach the backend before vhost_dev_stop() samples the vring base, @@ -156,7 +158,7 @@ static void vhost_blk_stop(VirtIODevice *vdev) ret = ioctl(s->vhostfd, VHOST_BLK_SET_BACKEND, &backend); assert(ret == 0); - vhost_dev_stop(&s->dev, vdev, false); + vhost_dev_stop(hdev, vdev, false); s->vhost_started = false; } -- 2.53.0