From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11020099.outbound.protection.outlook.com [52.101.84.99]) by lore.virtuozzo.com (Postfix) with ESMTPS id 3168081B58 for ; Tue, 17 Nov 2026 17:37:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rRTmsmJgRHu1ztQbS7Qtg3TcaYGmuSITMlISnDBXO0bJ618jfqZfl2ppDm87gSvGHvRLkQ80o1L2y6ouAY2tQ1nwN0IT2Qb4f79dfJh7RxTssgNwIP7s1ZDpDHU/vv57wIhq/ot2KKc5YzBGM/WW262fMARtNZRjCerOhIxtZRgcxHOfn0L40MxFzdeWCts3qS9DgjRkUhZTgkPA7No33fZQ6tWo+27QiPKHJOXvFhjSo73fftPjw68hGZDWnsw/imd0HZP8CgWYKveizY68XCtrl/xiSdxR8Nv+MT5J55FH7Lh4lqG91zW1OdZzblEmv537QSDAO/r6yXZ8bQvx6A== 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=ctGj2fddPOf4sfp2jwYb9JA2Pgo0QCj/bbh2KmYpvEVSzVxfOx7W9MoJomhnCs3jQtJ3as1Tf4bLJ6wHGql32C1+n1tmPFsWhc1z9BEIpD6tLSgRq+lScTj6G0pmkjaA813BRPYOyT+it9c9kD4jGJQKw6odTTpMOz80CRKDdC4FTjvNjtQRtjug957wA7G/5wlN6ggkcPueCdNlhLJiIw2qphIuLXcr9fpNQ6aPRfUClb/2YuYMh0H7bm3EV8xUViPmMrh+3U2Veb+w9HYnzPq0n5D6ZjFtb0WmVF90OTS7fohlBzUORYHNa0zyJV1QfqW/SaQC2uU5qJmScWC9Og== 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=nQqHBr9ZN1KSO1CSErUMy4F3m47WFlJMlI2SdpaZp6fMut8Rtw1Pm8/GQOSnSv/My/t9oTcQg3EViWFN9nuArk3Tj/H5cSXyVAQDSVWNWFu6nbIrXF3r3J0R7zVT4EHiVET31B+urHTiV/BYora58LXE3Rut6eKehW9GtzCa6KksRrQqKSSslToRW+SV04pYt6OXTal83DOo0Oq+i7L5WzrKLouX+Pq+Y6mRGIxElOD+IEbcFg9xEEmfBCHPtlZlnntbnG/6Z+fjuy1VK2/yIEHd0izQMeIzdgGHDfGP0kAc4SKllzp/lKfBXwzbSv19nxUBkD0O7sL4lUTkzmh4Vw== Received: from MA2P292CA0028.ESPP292.PROD.OUTLOOK.COM (2603:10a6:250::15) by AMDPR08MB11554.eurprd08.prod.outlook.com (2603:10a6:20b:71d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 17:37:40 +0000 Received: from MAD0EPF000008BD.eurprd04.prod.outlook.com (2603:10a6:250:0:cafe::72) by MA2P292CA0028.outlook.office365.com (2603:10a6:250::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.14 via Frontend Transport; Tue, 17 Nov 2026 17:37:38 +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 MAD0EPF000008BD.mail.protection.outlook.com (10.167.241.164) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.4 via Frontend Transport; Tue, 17 Nov 2026 17:37:38 +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=SyyW+4UQ39fG OalRVl+J+oCC3BDWbTYEYYaUQsB9IXjzGabok2PPoFwNTqvTelw4DPO8A9nB07rIhCQo19Jw9xmTb jaSfBkA7B/EAS8lr74Z9UfWMqbuvXE2OSQ3cA6pJg1bVXtKIsl3PWb0HgXHOPXMX1JHgDjNOzuGJx SXAybrIXwZ93Pw6eY3tX20fJDKnKuRiVEF1Y9ayCPU3UZvg3/0DGRphziTvFdBEuGBV+IjdANgyHG l362Y3HmLOVou1ZUbUPG1m82MCIocgTlfHj3uDBriJ2fv3eTgBwgKjVIaVCY/zvNIP5fWTwxBBejG VmoNIBPnuNJpDupB0Xu+Uw==; 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 1xTN3Q-000AxI-2w; Tue, 17 Nov 2026 18:37:27 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, svt-core@virtuozzo.com Subject: [PATCH hci-8.1 v6 3/7] vhost-blk: use a local vhost_dev pointer in start and stop Date: Tue, 17 Nov 2026 18:37:30 +0100 Message-ID: <20261117173734.3225443-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117173734.3225443-1-alexander.ivanov@virtuozzo.com> References: <20261117173734.3225443-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MAD0EPF000008BD:EE_|AMDPR08MB11554:EE_ X-MS-Office365-Filtering-Correlation-Id: ba6b232b-907d-4fd4-012a-08df44d17937 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|82310400026|36860700016|376014|1800799024|18002099003|5113699003|22082099003|261009223027099003|13003099007|56012099006|261021121427099003|261021123027099003|261102123227099003|10067099003; X-Microsoft-Antispam-Message-Info: aKcmuH7iY2yb9eRk0hKRi7GlrxjqrrzwpPCvkg+0YlZ7G1v9TlQTpE2GnjqhC588J+CjdNaU8uD+3mwnZbCd4ybcm8tEAmetocuoXG3rLrQ3pAM4hE2pdku74M9BGgOn74IDpOZDPNSdOUv1hDBqva4HkheG0uVU2N803D9UjJ0cNO5eDdlhnYIbHB1dsjJVpcuHykFzQjjJcX6voLkeQs7S19qHO3cpG2OT9enB0MuFiI6pTGiI3HiSCFXBw80X9Z9sGNKeyGCI5ea6IC2cyngkM4cZeRfX9KdJ7CyN8+jrZliFp1iKKsrlwvRsE4JqvIl6LtOVMAEn8XSYSzjy3L/6Es3w4f1ZFZknZHogU4Lo175ZYU5jXILrVa7M1P9p8xY+rSo0sL7Brkcy/ezTFuOEjB8xRFtYz2uSw7Ju3SyZciNGl4cwJx8kv8gW6zMcKFFVEgj042PO+Odi4up3BVIHuoxUd4dgJZlzb2wHCL2OE/04nvAxHbBXFIB5ZoqsXe7IKopsRKgjWdoPUeIpFHPsGnAIgMg4zxmPMy7wwUdYWhymFLeNKYAXW0xAS6w7L83JOZbcoDdnNFRpFuH9EuXEMgInKF2ERr64IBGd2HF0bs7HvC1sO1jD8ztPb9glpC606AsPVFQXYdJQxANOUQ== 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)(82310400026)(36860700016)(376014)(1800799024)(18002099003)(5113699003)(22082099003)(261009223027099003)(13003099007)(56012099006)(261021121427099003)(261021123027099003)(261102123227099003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TEOjFOkIBau2Qq80bmFHe7lCXhACCuk5T/V/GwRGDn/bZkFx3UwhHwjwO82A2MbSed5wtUxAevMbVDKll73AKbQ2nikaNwIHbmKyx03cQCmcsUPl7U+0Q7dQ/hUYbbpDvqZIccKc5ypjlLSBGqueXO9711aMT/xjkm+nulYfdeRziif6YTGGBLGx2s42711gEzHR9sTgZBoMpb6K1Ct25eaUEieSSFFo/IHdOg178ugPWNryyfBbLhlLzBwzBIIg8PHA+pLt1xS66vMiTOiWHv0w3OsMWR7focOIGaUACZ0OcHhu6X+BnpewVpfDOiDiwmzQ1ZU+qmv7eBT5uhH5qxABLtrJyIUbPD+9SR1xa389SGhHQYQ7x+HcLLFPwpIaN1+LEAnYmGbI9S4+ZSaxA9sR1Jz78w89c4/oJ4/6bKZs0OW4sSwNrTFd707HZpOl X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 17:37:38.2151 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba6b232b-907d-4fd4-012a-08df44d17937 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: MAD0EPF000008BD.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMDPR08MB11554 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