dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch

Daniel P. Berrangé c59732
From ebff02a43374c1138d4f8b2c07d2088a3921c288 Mon Sep 17 00:00:00 2001
Daniel P. Berrangé c59732
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Daniel P. Berrangé c59732
Date: Tue, 10 Jan 2023 12:37:14 -0500
Daniel P. Berrangé c59732
Subject: [PATCH 1/2] Revert "linux-user: add more compat ioctl definitions"
Daniel P. Berrangé c59732
MIME-Version: 1.0
Daniel P. Berrangé c59732
Content-Type: text/plain; charset=UTF-8
Daniel P. Berrangé c59732
Content-Transfer-Encoding: 8bit
Daniel P. Berrangé c59732
Daniel P. Berrangé c59732
This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
Daniel P. Berrangé c59732
Daniel P. Berrangé c59732
glibc has fixed (in 2.36.9000-40-g774058d729) the problem
Daniel P. Berrangé c59732
that caused a clash when both sys/mount.h annd linux/mount.h
Daniel P. Berrangé c59732
are included, and backported this to the 2.36 stable release
Daniel P. Berrangé c59732
too:
Daniel P. Berrangé c59732
Daniel P. Berrangé c59732
  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
Daniel P. Berrangé c59732
Daniel P. Berrangé c59732
It is saner for QEMU to remove the workaround it applied for
Daniel P. Berrangé c59732
glibc 2.36 and expect distros to ship the 2.36 maint release
Daniel P. Berrangé c59732
with the fix. This avoids needing to add a further workaround
Daniel P. Berrangé c59732
to QEMU to deal with the fact that linux/brtfs.h now also pulls
Daniel P. Berrangé c59732
in linux/mount.h via linux/fs.h since Linux 6.1
Daniel P. Berrangé c59732
Daniel P. Berrangé c59732
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Daniel P. Berrangé c59732
---
Daniel P. Berrangé c59732
 linux-user/syscall.c | 25 -------------------------
Daniel P. Berrangé c59732
 1 file changed, 25 deletions(-)
Daniel P. Berrangé c59732
Daniel P. Berrangé c59732
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
Daniel P. Berrangé c59732
index 1f8c10f8ef..9c1e9555e1 100644
Daniel P. Berrangé c59732
--- a/linux-user/syscall.c
Daniel P. Berrangé c59732
+++ b/linux-user/syscall.c
Daniel P. Berrangé c59732
@@ -111,31 +111,6 @@
Daniel P. Berrangé c59732
 #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
Daniel P. Berrangé c59732
 #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
Daniel P. Berrangé c59732
 #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
Daniel P. Berrangé c59732
-
Daniel P. Berrangé c59732
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
Daniel P. Berrangé c59732
-#define BLKDISCARD _IO(0x12,119)
Daniel P. Berrangé c59732
-#define BLKIOMIN _IO(0x12,120)
Daniel P. Berrangé c59732
-#define BLKIOOPT _IO(0x12,121)
Daniel P. Berrangé c59732
-#define BLKALIGNOFF _IO(0x12,122)
Daniel P. Berrangé c59732
-#define BLKPBSZGET _IO(0x12,123)
Daniel P. Berrangé c59732
-#define BLKDISCARDZEROES _IO(0x12,124)
Daniel P. Berrangé c59732
-#define BLKSECDISCARD _IO(0x12,125)
Daniel P. Berrangé c59732
-#define BLKROTATIONAL _IO(0x12,126)
Daniel P. Berrangé c59732
-#define BLKZEROOUT _IO(0x12,127)
Daniel P. Berrangé c59732
-
Daniel P. Berrangé c59732
-#define FIBMAP     _IO(0x00,1)
Daniel P. Berrangé c59732
-#define FIGETBSZ   _IO(0x00,2)
Daniel P. Berrangé c59732
-
Daniel P. Berrangé c59732
-struct file_clone_range {
Daniel P. Berrangé c59732
-        __s64 src_fd;
Daniel P. Berrangé c59732
-        __u64 src_offset;
Daniel P. Berrangé c59732
-        __u64 src_length;
Daniel P. Berrangé c59732
-        __u64 dest_offset;
Daniel P. Berrangé c59732
-};
Daniel P. Berrangé c59732
-
Daniel P. Berrangé c59732
-#define FICLONE         _IOW(0x94, 9, int)
Daniel P. Berrangé c59732
-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
Daniel P. Berrangé c59732
-
Daniel P. Berrangé c59732
 #else
Daniel P. Berrangé c59732
 #include <linux/fs.h>
Daniel P. Berrangé c59732
 #endif
Daniel P. Berrangé c59732
-- 
Daniel P. Berrangé c59732
2.38.1
Daniel P. Berrangé c59732