[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/17] linux-user: Add support for FS_IOC_<GET|SET>VERSION ioctls
From: |
Laurent Vivier |
Subject: |
[PULL 03/17] linux-user: Add support for FS_IOC_<GET|SET>VERSION ioctls |
Date: |
Thu, 23 Jan 2020 09:22:13 +0100 |
From: Aleksandar Markovic <address@hidden>
A very specific thing for these two ioctls is that their code
implies that their third argument is of type 'long', but the
kernel uses that argument as if it is of type 'int'. This anomaly
is recognized also in commit 6080723 (linux-user: Implement
FS_IOC_GETFLAGS and FS_IOC_SETFLAGS ioctls).
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Aleksandar Markovic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/ioctls.h | 2 ++
linux-user/syscall_defs.h | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index c6b9d6ad6653..c44f42eaf4e7 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -138,6 +138,8 @@
IOCTL(FS_IOC_GETFLAGS, IOC_R, MK_PTR(TYPE_INT))
IOCTL(FS_IOC_SETFLAGS, IOC_W, MK_PTR(TYPE_INT))
+ IOCTL(FS_IOC_GETVERSION, IOC_R, MK_PTR(TYPE_INT))
+ IOCTL(FS_IOC_SETVERSION, IOC_W, MK_PTR(TYPE_INT))
#ifdef CONFIG_USBFS
/* USB ioctls */
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 98c2119de9c1..f68a8b6e8e18 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -911,12 +911,14 @@ struct target_pollfd {
#define TARGET_FICLONE TARGET_IOW(0x94, 9, int)
#define TARGET_FICLONERANGE TARGET_IOW(0x94, 13, struct file_clone_range)
-/* Note that the ioctl numbers claim type "long" but the actual type
- * used by the kernel is "int".
+/*
+ * Note that the ioctl numbers for FS_IOC_<GET|SET><FLAGS|VERSION>
+ * claim type "long" but the actual type used by the kernel is "int".
*/
#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, abi_long)
#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, abi_long)
-
+#define TARGET_FS_IOC_GETVERSION TARGET_IOR('v', 1, abi_long)
+#define TARGET_FS_IOC_SETVERSION TARGET_IOW('v', 2, abi_long)
#define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap)
/* usb ioctls */
--
2.24.1
- [PULL 00/17] Linux user for 5.0 patches, Laurent Vivier, 2020/01/23
- [PULL 05/17] linux-user: Add support for FS_IOC32_<GET|SET>VERSION ioctls, Laurent Vivier, 2020/01/23
- [PULL 04/17] linux-user: Add support for FS_IOC32_<GET|SET>FLAGS ioctls, Laurent Vivier, 2020/01/23
- [PULL 08/17] configure: Detect kcov support and introduce CONFIG_KCOV, Laurent Vivier, 2020/01/23
- [PULL 01/17] linux-user:Fix align mistake when mmap guest space, Laurent Vivier, 2020/01/23
- [PULL 09/17] linux-user: Add support for KCOV_<ENABLE|DISABLE> ioctls, Laurent Vivier, 2020/01/23
- [PULL 10/17] linux-user: Add support for KCOV_INIT_TRACE ioctl, Laurent Vivier, 2020/01/23
- [PULL 06/17] linux-user: Add support for FD<SETEMSGTRESH|SETMAXERRS|GETMAXERRS> ioctls, Laurent Vivier, 2020/01/23
- [PULL 07/17] linux-user: Add support for FDFMT<BEG|TRK|END> ioctls, Laurent Vivier, 2020/01/23
- [PULL 03/17] linux-user: Add support for FS_IOC_<GET|SET>VERSION ioctls,
Laurent Vivier <=
- [PULL 02/17] linux-user: Reserve space for brk, Laurent Vivier, 2020/01/23
- [PULL 14/17] linux-user: Add support for getting/setting RTC periodic interrupt and epoch using ioctls, Laurent Vivier, 2020/01/23
- [PULL 17/17] linux-user: Add support for read/clear RTC voltage low detector using ioctls, Laurent Vivier, 2020/01/23
- [PULL 11/17] linux-user: Add support for TYPE_LONG and TYPE_ULONG in do_ioctl(), Laurent Vivier, 2020/01/23
- [PULL 15/17] linux-user: Add support for getting/setting RTC wakeup alarm using ioctls, Laurent Vivier, 2020/01/23
- [PULL 12/17] linux-user: Add support for enabling/disabling RTC features using ioctls, Laurent Vivier, 2020/01/23
- [PULL 16/17] linux-user: Add support for getting/setting RTC PLL correction using ioctls, Laurent Vivier, 2020/01/23
- [PULL 13/17] linux-user: Add support for getting/setting RTC time and alarm using ioctls, Laurent Vivier, 2020/01/23
- Re: [PULL 00/17] Linux user for 5.0 patches, Peter Maydell, 2020/01/23