Le 10/01/2023 à 18:48, Daniel P. Berrangé a écrit :
> It didn't appear that glibc was going to fix the problem
> breaking includes of linux/mount.h vs sys/mount.h, so
> QEMU applied a workaround copying the symbols/structs we
> need into a local header.
>
> Since then Linux modified linux/btrfs.h to pull in
> linux/fs.h which caused a clash with our workaround.
> Rather than invent workarounds for our workarounds,
> we can luckily just drop our previous workarounds.
> glibc has been fixed after all, and backported this
> fix to the stable 2.36 release series too. We should
> just expect distros to pull in the stable fix, which
> Fedora at least has already done.
>
> Daniel P. Berrangé (2):
> Revert "linux-user: add more compat ioctl definitions"
> Revert "linux-user: fix compat with glibc >= 2.36 sys/mount.h"
>
> linux-user/syscall.c | 43 -------------------------------------------
> meson.build | 2 --
> 2 files changed, 45 deletions(-)
>
Applied to my linux-user-for-8.0 branch.
Thanks,
Laurent