linux-user: revert previous workaround for glibc >= 2.36

[PATCH 0/2] linux-user: revert previous workaround for glibc >= 2.36

Daniel P. Berrangé posted 2 patches 1 year, 3 months ago

Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230110174901.2580297-1-berrange@redhat.com

Maintainers: Laurent Vivier <laurent@vivier.eu>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>

linux-user/syscall.c | 43 -------------------------------------------
meson.build          |  2 --
2 files changed, 45 deletions(-)

Expand all Fold all

[PATCH 0/2] linux-user: revert previous workaround for glibc >= 2.36

Posted by Daniel P. Berrangé 1 year, 3 months ago

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(-)

-- 
2.38.1

Re: [PATCH 0/2] linux-user: revert previous workaround for glibc >= 2.36

Posted by Laurent Vivier 1 year, 3 months ago

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

Re: [PATCH 0/2] linux-user: revert previous workaround for glibc >= 2.36

Posted by Marc-André Lureau 1 year, 3 months ago

Hi

On Tue, Jan 10, 2023 at 9:49 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> 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(-)
>
> --
> 2.38.1
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>