Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00b894e8 authored by Wang Sheng-Hui's avatar Wang Sheng-Hui Committed by Rusty Russell
Browse files

virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx 



Based on the layout description in the comments, take account of
the *_event_idx in functions vring_init and vring_size.

Signed-off-by: default avatarWang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 5f41f8bf

include/linux/virtio_ring.h

+3 −3
Original line number Diff line number Diff line
@@ -135,13 +135,13 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p, 
	vr->num = num;

	vr->desc = p;

	vr->avail = p + num*sizeof(struct vring_desc);

	vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + align-1)

			    & ~(align - 1));

	vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + sizeof(__u16)

		+ align-1) & ~(align - 1));

}



static inline unsigned vring_size(unsigned int num, unsigned long align)

{

	return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (2 + num)

	return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (3 + num)

		 + align - 1) & ~(align - 1))

		+ sizeof(__u16) * 3 + sizeof(struct vring_used_elem) * num;

}