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

Commit b97a8a90 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

vringh: 64 bit features 



Pass u64 everywhere.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8dc32b29

drivers/vhost/vringh.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -577,7 +577,7 @@ static inline int xfer_to_user(void *dst, void *src, size_t len) 
 * Returns an error if num is invalid: you should check pointers

 * Returns an error if num is invalid: you should check pointers

 * yourself!

 * yourself!

 */

 */

int vringh_init_user(struct vringh *vrh, u32 features,

int vringh_init_user(struct vringh *vrh, u64 features,

		     unsigned int num, bool weak_barriers,

		     unsigned int num, bool weak_barriers,

		     struct vring_desc __user *desc,

		     struct vring_desc __user *desc,

		     struct vring_avail __user *avail,

		     struct vring_avail __user *avail,
@@ -836,7 +836,7 @@ static inline int xfer_kern(void *src, void *dst, size_t len) 
 *

 *

 * Returns an error if num is invalid.

 * Returns an error if num is invalid.

 */

 */

int vringh_init_kern(struct vringh *vrh, u32 features,

int vringh_init_kern(struct vringh *vrh, u64 features,

		     unsigned int num, bool weak_barriers,

		     unsigned int num, bool weak_barriers,

		     struct vring_desc *desc,

		     struct vring_desc *desc,

		     struct vring_avail *avail,

		     struct vring_avail *avail,

include/linux/vringh.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ struct vringh_kiov { 
#define VRINGH_IOV_ALLOCATED 0x8000000

#define VRINGH_IOV_ALLOCATED 0x8000000





/* Helpers for userspace vrings. */

/* Helpers for userspace vrings. */

int vringh_init_user(struct vringh *vrh, u32 features,

int vringh_init_user(struct vringh *vrh, u64 features,

		     unsigned int num, bool weak_barriers,

		     unsigned int num, bool weak_barriers,

		     struct vring_desc __user *desc,

		     struct vring_desc __user *desc,

		     struct vring_avail __user *avail,

		     struct vring_avail __user *avail,
@@ -167,7 +167,7 @@ bool vringh_notify_enable_user(struct vringh *vrh); 
void vringh_notify_disable_user(struct vringh *vrh);

void vringh_notify_disable_user(struct vringh *vrh);





/* Helpers for kernelspace vrings. */

/* Helpers for kernelspace vrings. */

int vringh_init_kern(struct vringh *vrh, u32 features,

int vringh_init_kern(struct vringh *vrh, u64 features,

		     unsigned int num, bool weak_barriers,

		     unsigned int num, bool weak_barriers,

		     struct vring_desc *desc,

		     struct vring_desc *desc,

		     struct vring_avail *avail,

		     struct vring_avail *avail,