https://github.com/torvalds/linux
Revision c6ef7fd40eddad38a8825cbd6bb2ce8bdbba88f5 authored by Paul Gortmaker on 04 January 2017, 20:08:15 UTC, committed by Alex Williamson on 04 January 2017, 20:22:38 UTC
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>
1 parent e19f32d
History
Tip revision: c6ef7fd40eddad38a8825cbd6bb2ce8bdbba88f5 authored by Paul Gortmaker on 04 January 2017, 20:08:15 UTC
vfio-mdev: fix non-standard ioctl return val causing i386 build fail
Tip revision: c6ef7fd
File Mode Size
bpf
configs
debug
events
gcov
irq
livepatch
locking
power
printk
rcu
sched
time
trace
.gitignore -rw-r--r-- 69 bytes
Kconfig.freezer -rw-r--r-- 52 bytes
Kconfig.hz -rw-r--r-- 1.6 KB
Kconfig.locks -rw-r--r-- 4.8 KB
Kconfig.preempt -rw-r--r-- 2.1 KB
Makefile -rw-r--r-- 4.0 KB
acct.c -rw-r--r-- 15.4 KB
async.c -rw-r--r-- 9.9 KB
audit.c -rw-r--r-- 57.6 KB
audit.h -rw-r--r-- 11.1 KB
audit_fsnotify.c -rw-r--r-- 6.1 KB
audit_tree.c -rw-r--r-- 22.6 KB
audit_watch.c -rw-r--r-- 14.4 KB
auditfilter.c -rw-r--r-- 34.0 KB
auditsc.c -rw-r--r-- 64.7 KB
backtracetest.c -rw-r--r-- 2.1 KB
bounds.c -rw-r--r-- 703 bytes
capability.c -rw-r--r-- 13.9 KB
cgroup.c -rw-r--r-- 176.7 KB
cgroup_freezer.c -rw-r--r-- 12.4 KB
cgroup_pids.c -rw-r--r-- 8.9 KB
compat.c -rw-r--r-- 29.7 KB
configs.c -rw-r--r-- 2.8 KB
context_tracking.c -rw-r--r-- 6.3 KB
cpu.c -rw-r--r-- 43.9 KB
cpu_pm.c -rw-r--r-- 6.5 KB
cpuset.c -rw-r--r-- 76.5 KB
crash_dump.c -rw-r--r-- 1.3 KB
cred.c -rw-r--r-- 21.5 KB
delayacct.c -rw-r--r-- 4.5 KB
dma.c -rw-r--r-- 3.6 KB
elfcore.c -rw-r--r-- 396 bytes
exec_domain.c -rw-r--r-- 1.4 KB
exit.c -rw-r--r-- 43.4 KB
extable.c -rw-r--r-- 4.0 KB
fork.c -rw-r--r-- 55.9 KB
freezer.c -rw-r--r-- 4.4 KB
futex.c -rw-r--r-- 89.4 KB
futex_compat.c -rw-r--r-- 4.5 KB
groups.c -rw-r--r-- 5.2 KB
hung_task.c -rw-r--r-- 5.9 KB
irq_work.c -rw-r--r-- 4.4 KB
jump_label.c -rw-r--r-- 15.2 KB
kallsyms.c -rw-r--r-- 15.7 KB
kcmp.c -rw-r--r-- 4.4 KB
kcov.c -rw-r--r-- 7.3 KB
kexec.c -rw-r--r-- 6.8 KB
kexec_core.c -rw-r--r-- 39.6 KB
kexec_file.c -rw-r--r-- 25.4 KB
kexec_internal.h -rw-r--r-- 861 bytes
kmod.c -rw-r--r-- 19.1 KB
kprobes.c -rw-r--r-- 60.7 KB
ksysfs.c -rw-r--r-- 6.2 KB
kthread.c -rw-r--r-- 32.0 KB
latencytop.c -rw-r--r-- 7.8 KB
membarrier.c -rw-r--r-- 2.4 KB
memremap.c -rw-r--r-- 11.9 KB
module-internal.h -rw-r--r-- 458 bytes
module.c -rw-r--r-- 109.8 KB
module_signing.c -rw-r--r-- 2.2 KB
notifier.c -rw-r--r-- 16.3 KB
nsproxy.c -rw-r--r-- 6.4 KB
padata.c -rw-r--r-- 25.3 KB
panic.c -rw-r--r-- 15.7 KB
params.c -rw-r--r-- 24.1 KB
pid.c -rw-r--r-- 15.0 KB
pid_namespace.c -rw-r--r-- 11.0 KB
profile.c -rw-r--r-- 14.7 KB
ptrace.c -rw-r--r-- 32.3 KB
range.c -rw-r--r-- 3.0 KB
reboot.c -rw-r--r-- 13.3 KB
relay.c -rw-r--r-- 32.1 KB
resource.c -rw-r--r-- 39.3 KB
seccomp.c -rw-r--r-- 23.6 KB
signal.c -rw-r--r-- 94.5 KB
smp.c -rw-r--r-- 21.0 KB
smpboot.c -rw-r--r-- 13.3 KB
smpboot.h -rw-r--r-- 601 bytes
softirq.c -rw-r--r-- 19.0 KB
stacktrace.c -rw-r--r-- 1.7 KB
stop_machine.c -rw-r--r-- 17.1 KB
sys.c -rw-r--r-- 57.3 KB
sys_ni.c -rw-r--r-- 7.2 KB
sysctl.c -rw-r--r-- 67.3 KB
sysctl_binary.c -rw-r--r-- 50.9 KB
task_work.c -rw-r--r-- 3.3 KB
taskstats.c -rw-r--r-- 15.0 KB
test_kprobes.c -rw-r--r-- 7.4 KB
torture.c -rw-r--r-- 21.0 KB
tracepoint.c -rw-r--r-- 14.6 KB
tsacct.c -rw-r--r-- 5.1 KB
ucount.c -rw-r--r-- 5.5 KB
uid16.c -rw-r--r-- 5.0 KB
up.c -rw-r--r-- 2.0 KB
user-return-notifier.c -rw-r--r-- 1.3 KB
user.c -rw-r--r-- 5.4 KB
user_namespace.c -rw-r--r-- 27.3 KB
utsname.c -rw-r--r-- 3.6 KB
utsname_sysctl.c -rw-r--r-- 3.0 KB
watchdog.c -rw-r--r-- 22.5 KB
watchdog_hld.c -rw-r--r-- 6.3 KB
workqueue.c -rw-r--r-- 154.5 KB
workqueue_internal.h -rw-r--r-- 2.2 KB

back to top