[PULL 0/2] misc patch queue

[PULL 0/2] misc patch queue

[Richard Henderson]

The following changes since commit 190d5d7fd725ff754f94e8e0cbfb69f279c82b5d:

  Merge tag 'pull-request-2025-09-09' of https://gitlab.com/thuth/qemu into staging (2025-09-11 12:41:01 +0100)

are available in the Git repository at:

  https://gitlab.com/rth7680/qemu.git tags/pull-misc-20250916

for you to fetch changes up to a11d1847d5ef8a7db58e6d4e44f36fec708f0981:

  .gitmodules: move u-boot mirrors to qemu-project-mirrors (2025-09-16 09:58:20 -0700)

----------------------------------------------------------------
.gitmodules: move u-boot mirrors to qemu-project-mirrors
tests/functional/x86_64: Accept a few locked pages in test_memlock.py

----------------------------------------------------------------
Alex Bennée (1):
      .gitmodules: move u-boot mirrors to qemu-project-mirrors

Richard Henderson (1):
      tests/functional/x86_64: Accept a few locked pages in test_memlock.py

 .gitmodules                             | 4 ++--
 tests/functional/x86_64/test_memlock.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

[PULL 1/2] tests/functional/x86_64: Accept a few locked pages in test_memlock.py

[Richard Henderson]

Startup of libgcrypt locks a small pool of pages -- by default 16k.
Testing for zero locked pages is isn't correct, while testing for
32k is a decent compromise.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tests/functional/x86_64/test_memlock.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/functional/x86_64/test_memlock.py b/tests/functional/x86_64/test_memlock.py
index 2b515ff979..81bce80b0c 100755
--- a/tests/functional/x86_64/test_memlock.py
+++ b/tests/functional/x86_64/test_memlock.py
@@ -37,7 +37,8 @@ def test_memlock_off(self):
 
         status = self.get_process_status_values(self.vm.get_pid())
 
-        self.assertTrue(status['VmLck'] == 0)
+        # libgcrypt may mlock a few pages
+        self.assertTrue(status['VmLck'] < 32)
 
     def test_memlock_on(self):
         self.common_vm_setup_with_memlock('on')
-- 
2.43.0

[PULL 2/2] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Richard Henderson]

From: Alex Bennée <alex.bennee@linaro.org>

To continue our GitLab Open Source Program license we need to pass an
automated license check for all repos under qemu-project. While U-Boot
is clearly GPLv2 rather than fight with the automated validation
script just move the mirror across to a separate project.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20250908141911.2546063-1-alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 73cae4cd4d..e27dfe8c2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://gitlab.com/qemu-project/qemu-palcode.git
 [submodule "roms/u-boot"]
 	path = roms/u-boot
-	url = https://gitlab.com/qemu-project/u-boot.git
+	url = https://gitlab.com/qemu-project-mirrors/u-boot.git
 [submodule "roms/skiboot"]
 	path = roms/skiboot
 	url = https://gitlab.com/qemu-project/skiboot.git
@@ -27,7 +27,7 @@
 	url = https://gitlab.com/qemu-project/seabios-hppa.git
 [submodule "roms/u-boot-sam460ex"]
 	path = roms/u-boot-sam460ex
-	url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
+	url = https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git
 [submodule "roms/edk2"]
 	path = roms/edk2
 	url = https://gitlab.com/qemu-project/edk2.git
-- 
2.43.0

Re: [PULL 0/2] misc patch queue

[Richard Henderson]

On 9/16/25 10:09, Richard Henderson wrote:
> The following changes since commit 190d5d7fd725ff754f94e8e0cbfb69f279c82b5d:
> 
>    Merge tag 'pull-request-2025-09-09' of https://gitlab.com/thuth/qemu into staging (2025-09-11 12:41:01 +0100)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/rth7680/qemu.git tags/pull-misc-20250916
> 
> for you to fetch changes up to a11d1847d5ef8a7db58e6d4e44f36fec708f0981:
> 
>    .gitmodules: move u-boot mirrors to qemu-project-mirrors (2025-09-16 09:58:20 -0700)
> 
> ----------------------------------------------------------------
> .gitmodules: move u-boot mirrors to qemu-project-mirrors
> tests/functional/x86_64: Accept a few locked pages in test_memlock.py
> 
> ----------------------------------------------------------------
> Alex Bennée (1):
>        .gitmodules: move u-boot mirrors to qemu-project-mirrors
> 
> Richard Henderson (1):
>        tests/functional/x86_64: Accept a few locked pages in test_memlock.py
> 
>   .gitmodules                             | 4 ++--
>   tests/functional/x86_64/test_memlock.py | 3 ++-
>   2 files changed, 4 insertions(+), 3 deletions(-)

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

r~

Re: [PULL,2/2] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Paul Buxton]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

Hi,

It looks like the

https://gitlab.com/qemu-project/u-boot.git  repositories have now been removed. This breaks any older builds expecting those repositories to still exist.

Is the expectation for users on older versions to update their submodule paths? Or is this accidental?

Thanks,
Paul


[-- Attachment #2: Type: text/html, Size: 3410 bytes --]

Re: [PULL,2/2] .gitmodules: move u-boot mirrors to qemu-project-mirrors

[Alex Bennée]

Paul Buxton <paul.buxton@codasip.com> writes:

> Hi,
>
> It looks like the 
> https://gitlab.com/qemu-project/u-boot.git  repositories have now been removed. This breaks any older builds expecting those repositories to still exist.
>
> Is the expectation for users on older versions to update their
> submodule paths? Or is this accidental?

Yes. The patch should be trivially applicable to the stable branches.

  https://patchew.org/QEMU/20250908141911.2546063-1-alex.bennee@linaro.org/

>
> Thanks,
> Paul

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro