Skip to content

Commit a05e4e9

Browse files
alyssaismstsirkin
authored andcommitted
virtio_config: clarify output parameters
This was ambiguous enough for a broken patch (206cc44 ("virtio: reject shm region if length is zero")) to make it into the kernel, so make it clearer. Link: https://lore.kernel.org/r/20250816071600-mutt-send-email-mst@kernel.org/ Signed-off-by: Alyssa Ross <hi@alyssa.is> Message-Id: <20250829150944.233505-1-hi@alyssa.is> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent d6d673d commit a05e4e9

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

include/linux/virtio_config.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,15 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
193193
}
194194

195195
static inline void virtio_get_features(struct virtio_device *vdev,
196-
u64 *features)
196+
u64 *features_out)
197197
{
198198
if (vdev->config->get_extended_features) {
199-
vdev->config->get_extended_features(vdev, features);
199+
vdev->config->get_extended_features(vdev, features_out);
200200
return;
201201
}
202202

203-
virtio_features_from_u64(features, vdev->config->get_features(vdev));
203+
virtio_features_from_u64(features_out,
204+
vdev->config->get_features(vdev));
204205
}
205206

206207
/**
@@ -326,11 +327,11 @@ int virtqueue_set_affinity(struct virtqueue *vq, const struct cpumask *cpu_mask)
326327

327328
static inline
328329
bool virtio_get_shm_region(struct virtio_device *vdev,
329-
struct virtio_shm_region *region, u8 id)
330+
struct virtio_shm_region *region_out, u8 id)
330331
{
331332
if (!vdev->config->get_shm_region)
332333
return false;
333-
return vdev->config->get_shm_region(vdev, region, id);
334+
return vdev->config->get_shm_region(vdev, region_out, id);
334335
}
335336

336337
static inline bool virtio_is_little_endian(struct virtio_device *vdev)

0 commit comments

Comments
 (0)