Reviewed-by: Raphael Norwitz <[email protected]> On Wed, Aug 13, 2025 at 12:56 PM Vladimir Sementsov-Ogievskiy <[email protected]> wrote: > > One letter named variables doesn't really help to read the code, > and they simply duplicate structure fields. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> > --- > hw/virtio/vhost.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > index 97113174b9..c76e2dbb4e 100644 > --- a/hw/virtio/vhost.c > +++ b/hw/virtio/vhost.c > @@ -1272,7 +1272,6 @@ int vhost_virtqueue_start(struct vhost_dev *dev, > BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev))); > VirtioBusState *vbus = VIRTIO_BUS(qbus); > VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus); > - hwaddr l, a; > int r; > int vhost_vq_index = dev->vhost_ops->vhost_get_vq_index(dev, idx); > struct vhost_vring_file file = { > @@ -1283,28 +1282,27 @@ int vhost_virtqueue_start(struct vhost_dev *dev, > }; > struct VirtQueue *vvq = virtio_get_queue(vdev, idx); > > - a = virtio_queue_get_desc_addr(vdev, idx); > - if (a == 0) { > + vq->desc_phys = virtio_queue_get_desc_addr(vdev, idx); > + if (vq->desc_phys == 0) { > /* Queue might not be ready for start */ > return 0; > } > - vq->desc_size = l = virtio_queue_get_desc_size(vdev, idx); > - vq->desc_phys = a; > - vq->desc = vhost_memory_map(dev, a, l, false); > + vq->desc_size = virtio_queue_get_desc_size(vdev, idx); > + vq->desc = vhost_memory_map(dev, vq->desc_phys, vq->desc_size, false); > if (!vq->desc) { > r = -ENOMEM; > goto fail; > } > - vq->avail_size = l = virtio_queue_get_avail_size(vdev, idx); > - vq->avail_phys = a = virtio_queue_get_avail_addr(vdev, idx); > - vq->avail = vhost_memory_map(dev, a, l, false); > + vq->avail_size = virtio_queue_get_avail_size(vdev, idx); > + vq->avail_phys = virtio_queue_get_avail_addr(vdev, idx); > + vq->avail = vhost_memory_map(dev, vq->avail_phys, vq->avail_size, false); > if (!vq->avail) { > r = -ENOMEM; > goto fail; > } > - vq->used_size = l = virtio_queue_get_used_size(vdev, idx); > - vq->used_phys = a = virtio_queue_get_used_addr(vdev, idx); > - vq->used = vhost_memory_map(dev, a, l, true); > + vq->used_size = virtio_queue_get_used_size(vdev, idx); > + vq->used_phys = virtio_queue_get_used_addr(vdev, idx); > + vq->used = vhost_memory_map(dev, vq->used_phys, vq->used_size, true); > if (!vq->used) { > r = -ENOMEM; > goto fail; > -- > 2.48.1 > >
