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

Commit 44332f71 authored by Anthony Liguori's avatar Anthony Liguori Committed by Rusty Russell
Browse files

virtio: fix vring_init for 64 bits 



This patch fixes a typo in vring_init().  This happens to work today in lguest
because the sizeof(struct vring_desc) is 16 and struct vring contains 3
pointers and an unsigned int so on 32-bit
sizeof(struct vring_desc) == sizeof(struct vring).  However, this is no longer
true on 64-bit where the bug is exposed.

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 6e800af2

include/linux/virtio_ring.h

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ 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);

	vr->used = p + (num+1)*(sizeof(struct vring) + sizeof(__u16));

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

	vr->used = p + (num+1)*(sizeof(struct vring_desc) + sizeof(__u16));

}



static inline unsigned vring_size(unsigned int num)