diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2025-09-16 10:10:51 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2025-09-16 10:10:51 -0700 |
| commit | 2e66fb24a0ca9750df0d1d5b35197ff89c4bbd46 (patch) | |
| tree | 854dbc18d6937eb73955dfd801fbd7cd392d9ecf | |
| parent | 41511ed734dbf32f3c42ece60db0b86e081de4d2 (diff) | |
| parent | a11d1847d5ef8a7db58e6d4e44f36fec708f0981 (diff) | |
| download | focaccia-qemu-2e66fb24a0ca9750df0d1d5b35197ff89c4bbd46.tar.gz focaccia-qemu-2e66fb24a0ca9750df0d1d5b35197ff89c4bbd46.zip | |
Merge tag 'pull-misc-20250916' of https://gitlab.com/rth7680/qemu into staging
.gitmodules: move u-boot mirrors to qemu-project-mirrors tests/functional/x86_64: Accept a few locked pages in test_memlock.py # -----BEGIN PGP SIGNATURE----- # # iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmjJmVwdHHJpY2hhcmQu # aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV+RMQf/e2ScmOiJaD/5ba5i # RPZneCUOV0AkVSpAwxKX9M1Gsroz/NZefVp9yh2wPdcoAPnLjoFJaJuEv1jEPPVh # /RApI2NehuqWTzndY0dci6vV6YzxLoMZsQWoBRz0l3SfzVq0YuePSlV+YkTMSfgX # z9ocwPwGG0AEYvEllVPq5UVHZlEoE4BE23QyHtyuXRwjqo3BHjJKQXBK4hA5vAYQ # gbWiFs3QJ+fsKQk7Z2KJDc6k4H/Oql4T2bILGjQRb9DG4yR1TIvwIsbOj2dFHVrs # 6HdP5e6PweuHGc8mdFEHJFgZrdA8exxwT0lq/5vYxvjf86nick+z3XrhOXWoHq6G # L6OgLg== # =YBDc # -----END PGP SIGNATURE----- # gpg: Signature made Tue 16 Sep 2025 10:07:40 AM PDT # gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F # gpg: issuer "richard.henderson@linaro.org" # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [ultimate] * tag 'pull-misc-20250916' of https://gitlab.com/rth7680/qemu: .gitmodules: move u-boot mirrors to qemu-project-mirrors tests/functional/x86_64: Accept a few locked pages in test_memlock.py Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | tests/functional/x86_64/test_memlock.py | 3 |
2 files changed, 4 insertions, 3 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 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 @@ class MemlockTest(QemuSystemTest): 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') |