Separate the logic of attach vring, the subsequent patch will call it
separately.
Signed-off-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx>
---
drivers/virtio/virtio_ring.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index fc4e3db9f93b..00b18cf3b4d9 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1951,6 +1951,12 @@ static void virtqueue_vring_init_packed(struct vring_virtqueue_packed *vring_pac
}
}
+static void virtqueue_vring_attach_packed(struct vring_virtqueue *vq,
+ struct vring_virtqueue_packed *vring_packed)
+{
+ vq->packed = *vring_packed;
+}
+
static struct virtqueue *vring_create_virtqueue_packed(
unsigned int index,
unsigned int num,
@@ -1991,25 +1997,14 @@ static struct virtqueue *vring_create_virtqueue_packed(
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;
- vq->packed.ring_dma_addr = vring_packed.ring_dma_addr;
- vq->packed.driver_event_dma_addr = vring_packed.driver_event_dma_addr;
- vq->packed.device_event_dma_addr = vring_packed.device_event_dma_addr;
-
- vq->packed.ring_size_in_bytes = vring_packed.ring_size_in_bytes;
- vq->packed.event_size_in_bytes = vring_packed.event_size_in_bytes;
-
- vq->packed.vring = vring_packed.vring;
-
err = vring_alloc_state_extra_packed(&vring_packed);
if (err)
goto err_state_extra;
- vq->packed.desc_state = vring_packed.desc_state;
- vq->packed.desc_extra = vring_packed.desc_extra;
-
virtqueue_vring_init_packed(&vring_packed, !!callback);
virtqueue_init(vq, num);
+ virtqueue_vring_attach_packed(vq, &vring_packed);
spin_lock(&vdev->vqs_list_lock);
list_add_tail(&vq->vq.list, &vdev->vqs);
--
2.31.0
