]> git.ipfire.org Git - thirdparty/qemu.git/commit
Revert "linux-user: add more compat ioctl definitions"
authorDaniel P. Berrangé <berrange@redhat.com>
Tue, 10 Jan 2023 17:49:00 +0000 (12:49 -0500)
committerMichael Tokarev <mjt@tls.msk.ru>
Thu, 2 Nov 2023 12:09:11 +0000 (15:09 +0300)
commitcc64f9ac3d52d0b6f8af3039c531e15d0e95267f
treedf2aa289567a5ca64bb3d60a947f6c99e1cc403d
parente4a44eb819a7a59c46cdb62fbaefa559506a8410
Revert "linux-user: add more compat ioctl definitions"

This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.

glibc has fixed (in 2.36.9000-40-g774058d729) the problem
that caused a clash when both sys/mount.h annd linux/mount.h
are included, and backported this to the 2.36 stable release
too:

  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E

It is saner for QEMU to remove the workaround it applied for
glibc 2.36 and expect distros to ship the 2.36 maint release
with the fix. This avoids needing to add a further workaround
to QEMU to deal with the fact that linux/brtfs.h now also pulls
in linux/mount.h via linux/fs.h since Linux 6.1

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230110174901.2580297-2-berrange@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
(cherry picked from commit 9f0246539ae84a5e21efd1cc4516fc343f08115a)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
linux-user/syscall.c