0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. From afa96c55f2c270405de8984e2466067bbb44c0e4 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
  3. Date: Tue, 10 Jan 2023 12:49:00 -0500
  4. Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions"
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
  9. glibc has fixed (in 2.36.9000-40-g774058d729) the problem
  10. that caused a clash when both sys/mount.h annd linux/mount.h
  11. are included, and backported this to the 2.36 stable release
  12. too:
  13. https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
  14. It is saner for QEMU to remove the workaround it applied for
  15. glibc 2.36 and expect distros to ship the 2.36 maint release
  16. with the fix. This avoids needing to add a further workaround
  17. to QEMU to deal with the fact that linux/brtfs.h now also pulls
  18. in linux/mount.h via linux/fs.h since Linux 6.1
  19. Upstream-Status: Backport from v8.0 (master)
  20. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
  21. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
  22. Link: https://lore.kernel.org/r/20230110174901.2580297-2-berrange@redhat.com
  23. Signed-off-by: Joel Stanley <joel@jms.id.au>
  24. ---
  25. linux-user/syscall.c | 25 -------------------------
  26. 1 file changed, 25 deletions(-)
  27. diff --git a/linux-user/syscall.c b/linux-user/syscall.c
  28. index f95a6161e..510de8edc 100644
  29. --- a/linux-user/syscall.c
  30. +++ b/linux-user/syscall.c
  31. @@ -111,31 +111,6 @@
  32. #define FS_IOC32_SETFLAGS _IOW('f', 2, int)
  33. #define FS_IOC32_GETVERSION _IOR('v', 1, int)
  34. #define FS_IOC32_SETVERSION _IOW('v', 2, int)
  35. -
  36. -#define BLKGETSIZE64 _IOR(0x12,114,size_t)
  37. -#define BLKDISCARD _IO(0x12,119)
  38. -#define BLKIOMIN _IO(0x12,120)
  39. -#define BLKIOOPT _IO(0x12,121)
  40. -#define BLKALIGNOFF _IO(0x12,122)
  41. -#define BLKPBSZGET _IO(0x12,123)
  42. -#define BLKDISCARDZEROES _IO(0x12,124)
  43. -#define BLKSECDISCARD _IO(0x12,125)
  44. -#define BLKROTATIONAL _IO(0x12,126)
  45. -#define BLKZEROOUT _IO(0x12,127)
  46. -
  47. -#define FIBMAP _IO(0x00,1)
  48. -#define FIGETBSZ _IO(0x00,2)
  49. -
  50. -struct file_clone_range {
  51. - __s64 src_fd;
  52. - __u64 src_offset;
  53. - __u64 src_length;
  54. - __u64 dest_offset;
  55. -};
  56. -
  57. -#define FICLONE _IOW(0x94, 9, int)
  58. -#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range)
  59. -
  60. #else
  61. #include <linux/fs.h>
  62. #endif