diff --git a/gnu/local.mk b/gnu/local.mk index be789230323..c260c2d771c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2215,6 +2215,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-fix-agent-paths.patch \ %D%/packages/patches/qemu-fix-test-virtio-version.patch \ + %D%/packages/patches/qemu-disable-aarch64-migration-test.patch \ %D%/packages/patches/qrcodegen-cpp-cmake.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %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 @@ +This patch disables the 'migration-test' on AArch64, as it fails on some +devices like this: + +stderr: +qemu-system-aarch64: KVM does not support GICv3 emulation +Broken pipe +../../tests/qtest/libqtest.c:200: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) + +(test program exited with status code -6) + +TAP parsing error: Too few tests run (expected 61, got 0) + +--- a/tests/qtest/meson.build 2026-01-16 21:53:16.945167915 +0100 ++++ b/tests/qtest/meson.build 2026-01-16 21:52:55.313191080 +0100 +@@ -266,8 +266,7 @@ + qtests_cxl + \ + ['arm-cpu-features', + 'numa-test', +- 'boot-serial-test', +- 'migration-test'] ++ 'boot-serial-test'] + + qtests_s390x = \ + qtests_filter + \ \ No newline at end of file diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c4480f9f585..9e81d8e8d59 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -402,6 +402,14 @@ ;; failed to allocate memory for stack: Cannot allocate memory (substitute* "tests/qtest/meson.build" ((".*qtests_aspeed :.*") "")))))) + ((target-aarch64?) + #~((add-after 'unpack 'disable-some-tests + (lambda _ + ;; fails on some devices with GICv3 emulation not supported. + (let ((patch #$(local-file + (search-patch + "qemu-disable-aarch64-migration-test.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))))) (else '())) (add-after 'patch-source-shebangs 'patch-embedded-shebangs (lambda* (#:key native-inputs inputs #:allow-other-keys)