The following changes since commit 9360070196789cc8b9404b2efaf319384e64b107:

  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-05-12 13:41:26 +0200)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2024-05-14

for you to fetch changes up to da79537e0c8cef007d30298343d05acb0ba8b427:

  util/uri: Remove the old URI parsing code (2024-05-14 12:46:46 +0200)

----------------------------------------------------------------
* Fix the "tsan-build" CI job on the shared gitlab CI runners
* Bump minimum glib version and use URI code from the newer glib
* Fix error message from "configure" when C compiler is not working

----------------------------------------------------------------
Daniel P. Berrangé (3):
      dockerfiles: add 'MAKE' env variable to remaining containers
      gitlab: use $MAKE instead of 'make'
      gitlab: use 'setarch -R' to workaround tsan bug

Thomas Huth (8):
      configure: Fix error message when C compiler is not working
      Bump minimum glib version to v2.66
      Remove glib compatibility code that is not required anymore
      block/gluster: Use URI parsing code from glib
      block/nbd: Use URI parsing code from glib
      block/nfs: Use URI parsing code from glib
      block/ssh: Use URI parsing code from glib
      util/uri: Remove the old URI parsing code

 configure                                          |   11 +-
 meson.build                                        |   16 +-
 include/glib-compat.h                              |   27 +-
 include/qemu/uri.h                                 |   99 --
 block/gluster.c                                    |   69 +-
 block/nbd.c                                        |   76 +-
 block/nfs.c                                        |  110 +-
 block/ssh.c                                        |   75 +-
 qga/commands-posix-ssh.c                           |   12 +-
 util/error-report.c                                |   10 -
 util/uri.c                                         | 1466 --------------------
 .gitlab-ci.d/buildtest-template.yml                |    6 +-
 .gitlab-ci.d/buildtest.yml                         |    3 +
 .../dockerfiles/debian-all-test-cross.docker       |    1 +
 .../docker/dockerfiles/debian-hexagon-cross.docker |    1 +
 .../dockerfiles/debian-legacy-test-cross.docker    |    1 +
 .../dockerfiles/debian-loongarch-cross.docker      |    1 +
 .../docker/dockerfiles/debian-tricore-cross.docker |    1 +
 .../docker/dockerfiles/debian-xtensa-cross.docker  |    1 +
 tests/docker/dockerfiles/fedora-cris-cross.docker  |    1 +
 util/meson.build                                   |    2 +-
 21 files changed, 194 insertions(+), 1795 deletions(-)
 delete mode 100644 include/qemu/uri.h
 delete mode 100644 util/uri.c

On 5/14/24 14:51, Thomas Huth wrote:
> The following changes since commit 9360070196789cc8b9404b2efaf319384e64b107:
> 
>    Merge tag 'for-upstream' ofhttps://gitlab.com/bonzini/qemu  into staging (2024-05-12 13:41:26 +0200)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/thuth/qemu.git  tags/pull-request-2024-05-14
> 
> for you to fetch changes up to da79537e0c8cef007d30298343d05acb0ba8b427:
> 
>    util/uri: Remove the old URI parsing code (2024-05-14 12:46:46 +0200)
> 
> ----------------------------------------------------------------
> * Fix the "tsan-build" CI job on the shared gitlab CI runners
> * Bump minimum glib version and use URI code from the newer glib
> * Fix error message from "configure" when C compiler is not working

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.


r~

Hi Michael,

In this pull request, patches 2, 3 & 4 will be applicable to stable
to fix the tsan CI job which broke with the latest GitLab software
release.

On Tue, May 14, 2024 at 02:51:08PM +0200, Thomas Huth wrote:
> The following changes since commit 9360070196789cc8b9404b2efaf319384e64b107:
> 
>   Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-05-12 13:41:26 +0200)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/thuth/qemu.git tags/pull-request-2024-05-14
> 
> for you to fetch changes up to da79537e0c8cef007d30298343d05acb0ba8b427:
> 
>   util/uri: Remove the old URI parsing code (2024-05-14 12:46:46 +0200)
> 
> ----------------------------------------------------------------
> * Fix the "tsan-build" CI job on the shared gitlab CI runners
> * Bump minimum glib version and use URI code from the newer glib
> * Fix error message from "configure" when C compiler is not working
> 
> ----------------------------------------------------------------
> Daniel P. Berrangé (3):
>       dockerfiles: add 'MAKE' env variable to remaining containers
>       gitlab: use $MAKE instead of 'make'
>       gitlab: use 'setarch -R' to workaround tsan bug
> 
> Thomas Huth (8):
>       configure: Fix error message when C compiler is not working
>       Bump minimum glib version to v2.66
>       Remove glib compatibility code that is not required anymore
>       block/gluster: Use URI parsing code from glib
>       block/nbd: Use URI parsing code from glib
>       block/nfs: Use URI parsing code from glib
>       block/ssh: Use URI parsing code from glib
>       util/uri: Remove the old URI parsing code
> 
>  configure                                          |   11 +-
>  meson.build                                        |   16 +-
>  include/glib-compat.h                              |   27 +-
>  include/qemu/uri.h                                 |   99 --
>  block/gluster.c                                    |   69 +-
>  block/nbd.c                                        |   76 +-
>  block/nfs.c                                        |  110 +-
>  block/ssh.c                                        |   75 +-
>  qga/commands-posix-ssh.c                           |   12 +-
>  util/error-report.c                                |   10 -
>  util/uri.c                                         | 1466 --------------------
>  .gitlab-ci.d/buildtest-template.yml                |    6 +-
>  .gitlab-ci.d/buildtest.yml                         |    3 +
>  .../dockerfiles/debian-all-test-cross.docker       |    1 +
>  .../docker/dockerfiles/debian-hexagon-cross.docker |    1 +
>  .../dockerfiles/debian-legacy-test-cross.docker    |    1 +
>  .../dockerfiles/debian-loongarch-cross.docker      |    1 +
>  .../docker/dockerfiles/debian-tricore-cross.docker |    1 +
>  .../docker/dockerfiles/debian-xtensa-cross.docker  |    1 +
>  tests/docker/dockerfiles/fedora-cris-cross.docker  |    1 +
>  util/meson.build                                   |    2 +-
>  21 files changed, 194 insertions(+), 1795 deletions(-)
>  delete mode 100644 include/qemu/uri.h
>  delete mode 100644 util/uri.c
> 
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

15.05.2024 13:39, Daniel P. Berrangé пишет:
> Hi Michael,
> 
> In this pull request, patches 2, 3 & 4 will be applicable to stable
> to fix the tsan CI job which broke with the latest GitLab software
> release.

These are:

bad7a2759c dockerfiles: add 'MAKE' env variable to remaining containers
c53f7a1078 gitlab: use $MAKE instead of 'make'
b563959b90 gitlab: use 'setarch -R' to workaround tsan bug

I picked these up for 8.2 and 9.0, but not to 7.2 (yet), since this one
needs more work.

If someone can tell me which changes are also needed for 7.2, I'm all ears :)

Thanks,

/mjt
-- 
GPG Key transition (from rsa2048 to rsa4096) since 2024-04-24.
New key: rsa4096/61AD3D98ECDF2C8E  9D8B E14E 3F2A 9DD7 9199  28F1 61AD 3D98 ECDF 2C8E
Old key: rsa2048/457CE0A0804465C5  6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
Transition statement: http://www.corpit.ru/mjt/gpg-transition-2024.txt