Commit 26b36604 authored by Sonny Rao's avatar Sonny Rao Committed by Michael S. Tsirkin
Browse files

vhost: fix vhost ioctl signature to build with clang 



Clang is particularly anal about signed vs unsigned comparisons and
doesn't like the fact that some ioctl numbers set the MSB, so we get
this error when trying to build vhost on aarch64:

drivers/vhost/vhost.c:1400:7: error: overflow converting case value to
 switch condition type (3221794578 to 18446744072636378898)
 [-Werror, -Wswitch]
        case VHOST_GET_VRING_BASE:

3221794578 is 0xC008AF12 in hex
18446744072636378898 is 0xFFFFFFFFC008AF12 in hex

Fix this by using unsigned ints in the function signature for
vhost_vring_ioctl().

Signed-off-by: default avatarSonny Rao <sonnyrao@chromium.org>
Reviewed-by: default avatarDarren Kenny <darren.kenny@oracle.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 2d6d60a3

drivers/vhost/vhost.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1337,7 +1337,7 @@ err: 
	return -EFAULT;

	return -EFAULT;

}

}





long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)

long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp)

{

{

	struct file *eventfp, *filep = NULL;

	struct file *eventfp, *filep = NULL;

	bool pollstart = false, pollstop = false;

	bool pollstart = false, pollstop = false;

drivers/vhost/vhost.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ void vhost_poll_stop(struct vhost_poll *poll); 
void vhost_poll_flush(struct vhost_poll *poll);

void vhost_poll_flush(struct vhost_poll *poll);

void vhost_poll_queue(struct vhost_poll *poll);

void vhost_poll_queue(struct vhost_poll *poll);

void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work);

void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work);

long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp);

long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp);





struct vhost_log {

struct vhost_log {

	u64 addr;

	u64 addr;
@@ -177,7 +177,7 @@ void vhost_dev_reset_owner(struct vhost_dev *, struct vhost_umem *); 
void vhost_dev_cleanup(struct vhost_dev *);

void vhost_dev_cleanup(struct vhost_dev *);

void vhost_dev_stop(struct vhost_dev *);

void vhost_dev_stop(struct vhost_dev *);

long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp);

long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp);

long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp);

long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp);

int vhost_vq_access_ok(struct vhost_virtqueue *vq);

int vhost_vq_access_ok(struct vhost_virtqueue *vq);

int vhost_log_access_ok(struct vhost_dev *);

int vhost_log_access_ok(struct vhost_dev *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE