summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRutherther <rutherther@ditigal.xyz>2026-01-16 22:06:24 +0100
committerRutherther <rutherther@ditigal.xyz>2026-01-17 20:31:06 +0100
commitb50a7973dba15388953225c126627d503b936f85 (patch)
tree954e509c403af8935d79aa7a7b2f52cbe6b66765
parent7c3fec8a6ddf3a77be47212f56e9c5033b11e24b (diff)
gnu: qemu: Disable failing migration-test on AArch64.
On some AArch64 devices, like RPi5 or honeycombs used by CI, the test fails. * gnu/packages/patches/qemu-disable-aarch64-migration-test.patch: New file. * gnu/packages/virtualization.scm (qemu): Patch it. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ica2d31bc53e154637036c13517289c6c78010739 Fixes: #2447 Signed-off-by: Rutherther <rutherther@ditigal.xyz> Merges: #5683
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/qemu-disable-aarch64-migration-test.patch24
-rw-r--r--gnu/packages/virtualization.scm8
3 files changed, 33 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index bafc7e71351..edf3e69b231 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2210,6 +2210,7 @@ dist_patch_DATA = \
2210 %D%/packages/patches/qemu-glibc-2.30.patch \ 2210 %D%/packages/patches/qemu-glibc-2.30.patch \
2211 %D%/packages/patches/qemu-fix-agent-paths.patch \ 2211 %D%/packages/patches/qemu-fix-agent-paths.patch \
2212 %D%/packages/patches/qemu-fix-test-virtio-version.patch \ 2212 %D%/packages/patches/qemu-fix-test-virtio-version.patch \
2213 %D%/packages/patches/qemu-disable-aarch64-migration-test.patch \
2213 %D%/packages/patches/qrcodegen-cpp-cmake.patch \ 2214 %D%/packages/patches/qrcodegen-cpp-cmake.patch \
2214 %D%/packages/patches/qtbase-absolute-runpath.patch \ 2215 %D%/packages/patches/qtbase-absolute-runpath.patch \
2215 %D%/packages/patches/qtbase-qmake-fix-includedir.patch \ 2216 %D%/packages/patches/qtbase-qmake-fix-includedir.patch \
diff --git a/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch b/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch
new file mode 100644
index 00000000000..1b64db8388d
--- /dev/null
+++ b/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch
@@ -0,0 +1,24 @@
1This patch disables the 'migration-test' on AArch64, as it fails on some
2devices like this:
3
4stderr:
5qemu-system-aarch64: KVM does not support GICv3 emulation
6Broken pipe
7../../tests/qtest/libqtest.c:200: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
8
9(test program exited with status code -6)
10
11TAP parsing error: Too few tests run (expected 61, got 0)
12
13--- a/tests/qtest/meson.build 2026-01-16 21:53:16.945167915 +0100
14+++ b/tests/qtest/meson.build 2026-01-16 21:52:55.313191080 +0100
15@@ -266,8 +266,7 @@
16 qtests_cxl + \
17 ['arm-cpu-features',
18 'numa-test',
19- 'boot-serial-test',
20- 'migration-test']
21+ 'boot-serial-test']
22
23 qtests_s390x = \
24 qtests_filter + \ \ No newline at end of file
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 2ac254d1a31..77700c15eec 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -402,6 +402,14 @@
402 ;; failed to allocate memory for stack: Cannot allocate memory 402 ;; failed to allocate memory for stack: Cannot allocate memory
403 (substitute* "tests/qtest/meson.build" 403 (substitute* "tests/qtest/meson.build"
404 ((".*qtests_aspeed :.*") "")))))) 404 ((".*qtests_aspeed :.*") ""))))))
405 ((target-aarch64?)
406 #~((add-after 'unpack 'disable-some-tests
407 (lambda _
408 ;; fails on some devices with GICv3 emulation not supported.
409 (let ((patch #$(local-file
410 (search-patch
411 "qemu-disable-aarch64-migration-test.patch"))))
412 (invoke "patch" "--force" "-p1" "-i" patch))))))
405 (else '())) 413 (else '()))
406 (add-after 'patch-source-shebangs 'patch-embedded-shebangs 414 (add-after 'patch-source-shebangs 'patch-embedded-shebangs
407 (lambda* (#:key native-inputs inputs #:allow-other-keys) 415 (lambda* (#:key native-inputs inputs #:allow-other-keys)