[dpdk-dev,RFC,08/10] virtio: remove redundant vq_alignment
Commit Message
Since vq_alignment is constant (always 4K), it does not
need to be part of the vring struct.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/librte_pmd_virtio/virtio_ethdev.c | 1 -
lib/librte_pmd_virtio/virtio_rxtx.c | 2 +-
lib/librte_pmd_virtio/virtqueue.h | 3 +--
3 files changed, 2 insertions(+), 4 deletions(-)
Comments
Acked by: Changchun Ouyang <Changchun.ouyang@intel.com>
> -----Original Message-----
> From: Stephen Hemminger [mailto:stephen@networkplumber.org]
> Sent: Tuesday, August 26, 2014 10:08 AM
> To: Ouyang, Changchun
> Cc: dev@dpdk.org; Stephen Hemminger
> Subject: [RFC 08/10] virtio: remove redundant vq_alignment
>
> Since vq_alignment is constant (always 4K), it does not need to be part of the
> vring struct.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
>
> ---
> lib/librte_pmd_virtio/virtio_ethdev.c | 1 -
> lib/librte_pmd_virtio/virtio_rxtx.c | 2 +-
> lib/librte_pmd_virtio/virtqueue.h | 3 +--
> 3 files changed, 2 insertions(+), 4 deletions(-)
>
> --- a/lib/librte_pmd_virtio/virtio_ethdev.c 2014-08-25
> 19:00:09.918550097 -0700
> +++ b/lib/librte_pmd_virtio/virtio_ethdev.c 2014-08-25
> 19:00:09.918550097 -0700
> @@ -290,7 +290,6 @@ int virtio_dev_queue_setup(struct rte_et
> vq->port_id = dev->data->port_id;
> vq->queue_id = queue_idx;
> vq->vq_queue_index = vtpci_queue_idx;
> - vq->vq_alignment = VIRTIO_PCI_VRING_ALIGN;
> vq->vq_nentries = vq_size;
> vq->vq_free_cnt = vq_size;
>
> --- a/lib/librte_pmd_virtio/virtio_rxtx.c 2014-08-25 19:00:09.918550097 -0700
> +++ b/lib/librte_pmd_virtio/virtio_rxtx.c 2014-08-25
> 19:00:09.918550097 -0700
> @@ -258,7 +258,7 @@ virtio_dev_vring_start(struct virtqueue
> * Reinitialise since virtio port might have been stopped and restarted
> */
> memset(vq->vq_ring_virt_mem, 0, vq->vq_ring_size);
> - vring_init(vr, size, ring_mem, vq->vq_alignment);
> + vring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN);
> vq->vq_used_cons_idx = 0;
> vq->vq_desc_head_idx = 0;
> vq->vq_avail_idx = 0;
> --- a/lib/librte_pmd_virtio/virtqueue.h 2014-08-25 19:00:09.918550097 -0700
> +++ b/lib/librte_pmd_virtio/virtqueue.h 2014-08-25
> 19:00:09.918550097 -0700
> @@ -139,8 +139,7 @@ struct virtqueue {
> uint8_t port_id; /**< Device port identifier. */
>
> void *vq_ring_virt_mem; /**< linear address of vring*/
> - int vq_alignment;
> - int vq_ring_size;
> + unsigned int vq_ring_size;
> phys_addr_t vq_ring_mem; /**< physical address of vring */
>
> struct vring vq_ring; /**< vring keeping desc, used and avail */
@@ -290,7 +290,6 @@ int virtio_dev_queue_setup(struct rte_et
vq->port_id = dev->data->port_id;
vq->queue_id = queue_idx;
vq->vq_queue_index = vtpci_queue_idx;
- vq->vq_alignment = VIRTIO_PCI_VRING_ALIGN;
vq->vq_nentries = vq_size;
vq->vq_free_cnt = vq_size;
@@ -258,7 +258,7 @@ virtio_dev_vring_start(struct virtqueue
* Reinitialise since virtio port might have been stopped and restarted
*/
memset(vq->vq_ring_virt_mem, 0, vq->vq_ring_size);
- vring_init(vr, size, ring_mem, vq->vq_alignment);
+ vring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN);
vq->vq_used_cons_idx = 0;
vq->vq_desc_head_idx = 0;
vq->vq_avail_idx = 0;
@@ -139,8 +139,7 @@ struct virtqueue {
uint8_t port_id; /**< Device port identifier. */
void *vq_ring_virt_mem; /**< linear address of vring*/
- int vq_alignment;
- int vq_ring_size;
+ unsigned int vq_ring_size;
phys_addr_t vq_ring_mem; /**< physical address of vring */
struct vring vq_ring; /**< vring keeping desc, used and avail */