From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11020109.outbound.protection.outlook.com [52.101.69.109]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7B52180E7E for ; Sat, 31 Oct 2026 15:35:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sIdwVY4t5jIa0xRIddtGPZsxi4duz9ZVLXftryPDJFzqn66dwB/9QY2L5XGe5igVDhEWnYMacSCbOFEgo1SWknqSDDp47VMJuCTHfGoxWZEb/ZllnrleSwq7Nah5HvO7nt1Sj+I7Exfc2hAf58MRYSyUAOhZM+VFvOWxO/hcgWsXy1SSNvDbyUgEf1vDZ65lCV6WCJXeE/c0CsTGsvlatzFAFYGvdxXiBwlgOs8QpLuQS1QW/r2MWLFyQmEHi6y5TfZtVnIMe/xXxogj6IZ5Rpb9RTW+2Gcvgs7MeQHGZd/WcA1uiAHUeKCf+pNbgQn326hAz6wb0xaN+PO/dUU4+Q== 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=LyhcmoW1ks27ANi8D7W+BfVSVFyDwLGt1H1pVQLqfFt5NtbOpqefW+djTQGYSzPXp4smiVx+BGTa4Na7b8vIjxonOS8YKZxfIliMvPHe3uIKAW7hPBf/R5kwS2cv81cdSTOC+m5Ajuq1/fHaI6Uc4Gz1REUv9ciQa6Pof4INHJF0yfn3bXsxQ8c8MAJENOqRppF/3dG7Vdt05gYQMWHT84lFJoLJUjW4Kvml/pxobDYBA/J0xMQWCYOMjIZwuG+PutcNxvs3mYLAuTVBbHA/DgQ+1QGmaxdQhEHjLlwOfinvMzpyiUbOfM6xl3s1sN2zRzzNa/5lJd2jnlrRRMSiPw== 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=Ea4Si7mXofqw8nP2m7upphZrPIBoyct+H44WYWFUSzWKHwp48q2nmThtvAQjEt56qbra8QCZmutORgiZ0FyTMUNSjnmg/ahSbc5EsWmxIpy5MQxK7hVoFbZnewfXM4Sfbqp0FsOztjMixMnrUYFtVHk7N3881Ptzb1dNTBqUCEMX7eydoSEs9dw5WEuhSjs931IP5sEAx5KJb3C7JjhvC4aY2i9hHlH7jwruWva8p41AuBTfgf9JNMJT9a+vh7hyD/fnLzdJ0Lr/+hg/JlH8PLi1EZtpk/UXB0C4dPKCVzKiomE/5tnbCrbk0eGOo9yjpsSDVzne6UMkvFD+NR+a7g== Received: from PR3P193CA0006.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:50::11) by DB9PR08MB6426.eurprd08.prod.outlook.com (2603:10a6:10:255::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.11; Sat, 31 Oct 2026 15:35:34 +0000 Received: from MI3PEPF00008559.eurprd05.prod.outlook.com (2603:10a6:102:50:cafe::87) by PR3P193CA0006.outlook.office365.com (2603:10a6:102:50::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.569.10 via Frontend Transport; Sat, 31 Oct 2026 15:35:34 +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 MI3PEPF00008559.mail.protection.outlook.com (10.167.240.21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.592.5 via Frontend Transport; Sat, 31 Oct 2026 15:35:33 +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=SlYT8Egnu+E2 leOvPNinqDXEP58zs1lw4HquoHgXJ1xSJA+GKMBw61Et7qWwzlfqUNwnyVR/twYvYR5i1fwD/cTBT k2AsdPslAXEJiUbLhgeegkK2ZjBMEQ2OzwtOfm0DEitdYTTZecJa+RI5zxysrnJacBa0+R8ZMwVpd 7imZKSX/C6XxXLF8jMNfgIN8wpSRiu0OUJSLNoVKSGp7E3lYOa5DRI79Crru7xoPgyu0XUVz2+FOw vCUIOwm/nbgRUX882kAr11zr5hdZa9Zkirxr4m7tabPtwxA2kGbE1Xm1IaSLDtVHGYkX2VC7RVS/G jURI0ioWNhjFJqB6ztrunw==; 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 1xNB3O-00CuDQ-1T; Sat, 31 Oct 2026 16:35:28 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, svt-core@virtuozzo.com Subject: [PATCH hci-8.1 v5 3/5] vhost-blk: use a local vhost_dev pointer in start and stop Date: Sat, 31 Oct 2026 16:35:26 +0100 Message-ID: <20261031153528.3857823-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261031153528.3857823-1-alexander.ivanov@virtuozzo.com> References: <20261031153528.3857823-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MI3PEPF00008559:EE_|DB9PR08MB6426:EE_ X-MS-Office365-Filtering-Correlation-Id: 6aeaa0b6-09a4-4b8b-358f-08df37649a6b 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|36860700016|376014|82310400026|1800799024|23010399003|5113699003|10067099003|18002099003|22082099003|13003099007|56012099006|261021121427099003|261021123027099003|261009223027099003; X-Microsoft-Antispam-Message-Info: UEPGQQaU+1KOB6X8/IfJ/gk9xFWmd1qWZRjBZFYalMNfebNwzIzpZOprqOPfp90Z5tR4VF2gHr3+VabqBAzBK4ZUs/9N3l0dIHNZlzQsjwCjThnl34fgbqblb4GUrIAG6SGdUovGFc+sR2dM1AAddSYaVWpVQG5nxuHwlvXY4zf99pObhlY1d7hjcGzMnz7t95LRwDMdf9kmOTT0JuKzW2ZXAaQNpBmzHTIW9XuBK8MTuKkejCErLuCem9UmNROxaN1yzuHR/+rdUn6z+3NpOQf93RTHnfmlCFaUUC9h5q6QNSYgUiRQ9pjAXFNn69Tg1sruLHMIcEOxQFqsI6IZncIkijehVAdx1Ut/OMzCxaTFgCnyQYN8zgE6y0aEwC9uFqCdnK0rCa1UgfcIm5/ep4RtgAEV3p53+BsWNDCPFLpgKFfqWO38tIO3/vVFcPnXLcLI0RJBir5wNK4ijTvbgkuZl2nr0NGdobSmuaIHSKgDUX19EKepM3SoYL6SfOSnbakvCBoZ0XACdy8Gk8uDzRg95LnRVjVtpjiJcdxOg/pIAYnLAFjUH2WA8tyPxXzG90hLdk65ZUzTHz1SQP9e/galoAUIsUB3My5nsyQpISfRgpfQ7iD3OINcaTJGsXEo0wz71tQk/9V/0+nqV8FhqA== 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)(36860700016)(376014)(82310400026)(1800799024)(23010399003)(5113699003)(10067099003)(18002099003)(22082099003)(13003099007)(56012099006)(261021121427099003)(261021123027099003)(261009223027099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8421R586v3woes5dzByrCHYI+4bFLIYGP3wwZ5pvCWWRB6SP8JebLfzKwn+CairOMeMEULfls9yS9xNQdwVuSafWZDlHLkmvq+obNlUda4SNdj5XqjIRVA0SF/NqaO38GbVgyY2I7xr0sHkqn5IDhF+mmCp2XkokECZ0x8GHCX/vGLRZueiEXjBuiLvA6FzbJQVrwuu86dAsChE0jaHokykqXjj02xV4sqe0K1dHDAhe9NL5quAT31sIAi5/UoLBo2j1JwBzDzNtXql6wdzTYmPwBq1zY06eZQ7cCVpOeuTRrEdQcMvJ3PYGLEXaIDdCj9wP+VyaaqF/FwCxRLRSKkFiR41Y++awKnUoZ1EuYTz2zwkoBcUXjYkyEd+sD9/6E6GShK8nUy9IZlPJeucfw5qqE55K2wpQ/IJu2XT4PfNJM5iUP2csiEWHOHHAUx0l X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2026 15:35:33.6829 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6aeaa0b6-09a4-4b8b-358f-08df37649a6b 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: MI3PEPF00008559.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6426 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