Commit 1f28750f authored by Jason Wang's avatar Jason Wang Committed by Michael S. Tsirkin
Browse files

virtio_ring: rename vring_desc_extra_packed 



Rename vring_desc_extra_packed to vring_desc_extra since the structure
are pretty generic which could be reused by split virtqueue as well.

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210604055350.58753-3-jasowang@redhat.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent aeef9b47

drivers/virtio/virtio_ring.c

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct vring_desc_state_packed { 
	u16 last;			/* The last desc state in a list. */

};



struct vring_desc_extra_packed {

struct vring_desc_extra {

	dma_addr_t addr;		/* Buffer DMA addr. */

	u32 len;			/* Buffer length. */

	u16 flags;			/* Descriptor flags. */
@@ -169,7 +169,7 @@ struct vring_virtqueue { 


			/* Per-descriptor state. */

			struct vring_desc_state_packed *desc_state;

			struct vring_desc_extra_packed *desc_extra;

			struct vring_desc_extra *desc_extra;



			/* DMA address and size information */

			dma_addr_t ring_dma_addr;
@@ -918,7 +918,7 @@ static struct virtqueue *vring_create_virtqueue_split( 
 */



static void vring_unmap_state_packed(const struct vring_virtqueue *vq,

				     struct vring_desc_extra_packed *state)

				     struct vring_desc_extra *state)

{

	u16 flags;
@@ -1658,13 +1658,13 @@ static struct virtqueue *vring_create_virtqueue_packed( 
	vq->free_head = 0;



	vq->packed.desc_extra = kmalloc_array(num,

			sizeof(struct vring_desc_extra_packed),

			sizeof(struct vring_desc_extra),

			GFP_KERNEL);

	if (!vq->packed.desc_extra)

		goto err_desc_extra;



	memset(vq->packed.desc_extra, 0,

		num * sizeof(struct vring_desc_extra_packed));

		num * sizeof(struct vring_desc_extra));



	for (i = 0; i < num - 1; i++)

		vq->packed.desc_extra[i].next = i + 1;