Commit c60923cb authored Nov 22, 2016 by Gonglei Committed by Michael S. Tsirkin Dec 15, 2016

virtio_ring: fix complaint by sparse



 # make C=2 CF="-D__CHECK_ENDIAN__" ./drivers/virtio/

drivers/virtio/virtio_ring.c:423:19: warning: incorrect type in assignment (different base types)
drivers/virtio/virtio_ring.c:423:19:    expected unsigned int [unsigned] [assigned] i
drivers/virtio/virtio_ring.c:423:19:    got restricted __virtio16 [usertype] next
drivers/virtio/virtio_ring.c:423:19: warning: incorrect type in assignment (different base types)
drivers/virtio/virtio_ring.c:423:19:    expected unsigned int [unsigned] [assigned] i
drivers/virtio/virtio_ring.c:423:19:    got restricted __virtio16 [usertype] next
drivers/virtio/virtio_ring.c:423:19: warning: incorrect type in assignment (different base types)
drivers/virtio/virtio_ring.c:423:19:    expected unsigned int [unsigned] [assigned] i
drivers/virtio/virtio_ring.c:423:19:    got restricted __virtio16 [usertype] next
drivers/virtio/virtio_ring.c:604:39: warning: incorrect type in initializer (different base types)
drivers/virtio/virtio_ring.c:604:39:    expected unsigned short [unsigned] [usertype] nextflag
drivers/virtio/virtio_ring.c:604:39:    got restricted __virtio16
drivers/virtio/virtio_ring.c:612:33: warning: restricted __virtio16 degrades to integer

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent 61bd405f

drivers/virtio/virtio_ring.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -420,7 +420,7 @@ static inline int virtqueue_add(struct virtqueue *_vq,
	if (i == err_idx)		if (i == err_idx)
	break;		break;
	vring_unmap_one(vq, &desc[i]);		vring_unmap_one(vq, &desc[i]);
	i = vq->vring.desc[i].next;		i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next);
	}		}

	vq->vq.num_free += total_sg;		vq->vq.num_free += total_sg;
	@@ -601,7 +601,7 @@ EXPORT_SYMBOL_GPL(virtqueue_kick);
	static void detach_buf(struct vring_virtqueue *vq, unsigned int head)		static void detach_buf(struct vring_virtqueue *vq, unsigned int head)
	{		{
	unsigned int i, j;		unsigned int i, j;
	u16 nextflag = cpu_to_virtio16(vq->vq.vdev, VRING_DESC_F_NEXT);		__virtio16 nextflag = cpu_to_virtio16(vq->vq.vdev, VRING_DESC_F_NEXT);

	/* Clear data ptr. */		/* Clear data ptr. */
	vq->desc_state[head].data = NULL;		vq->desc_state[head].data = NULL;