Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

vfio-mdev: fix non-standard ioctl return val causing i386 build fail

What appears to be a copy and paste error from the line above gets
the ioctl a ssize_t return value instead of the traditional "int".

The associated sample code used "long" which meant it would compile
for x86-64 but not i386, with the latter failing as follows:

CC [M] samples/vfio-mdev/mtty.o
samples/vfio-mdev/mtty.c:1418:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.ioctl = mtty_ioctl,
^
samples/vfio-mdev/mtty.c:1418:20: note: (near initialization for ‘mdev_fops.ioctl’)
cc1: some warnings being treated as errors

Since in this case, vfio is working with struct file_operations; as such:

long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);

...and so here we just standardize on long vs. the normal int that user
space typically sees and documents as per "man ioctl" and similar.

Fixes: 9d1a546c53b4 ("docs: Sample driver to demonstrate how to use Mediated device framework.")
Cc: Kirti Wankhede <kwankhede@nvidia.com>
Cc: Neo Jia <cjia@nvidia.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

authored by

Paul Gortmaker and committed by
Alex Williamson
c6ef7fd4 e19f32da

+1 -1
+1 -1
include/linux/mdev.h
··· 78 78 size_t count, loff_t *ppos); 79 79 ssize_t (*write)(struct mdev_device *mdev, const char __user *buf, 80 80 size_t count, loff_t *ppos); 81 - ssize_t (*ioctl)(struct mdev_device *mdev, unsigned int cmd, 81 + long (*ioctl)(struct mdev_device *mdev, unsigned int cmd, 82 82 unsigned long arg); 83 83 int (*mmap)(struct mdev_device *mdev, struct vm_area_struct *vma); 84 84 };