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

Commit d768f32a authored by Thomas Huth's avatar Thomas Huth Committed by Michael S. Tsirkin
Browse files

virtio: Fix typecast of pointer in vring_init() 



The virtio_ring.h header is used in userspace programs (ie. QEMU),
too. Here we can not assume that sizeof(pointer) is the same as
sizeof(long), e.g. when compiling for Windows, so the typecast in
vring_init() should be done with (uintptr_t) instead of (unsigned long).

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 908a5544

include/uapi/linux/virtio_ring.h

+4 −1
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
 * SUCH DAMAGE.

 *

 * Copyright Rusty Russell IBM Corporation 2007. */

#ifndef __KERNEL__

#include <stdint.h>

#endif

#include <linux/types.h>

#include <linux/virtio_types.h>
@@ -143,7 +146,7 @@ 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] + sizeof(__virtio16)

	vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)

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

}