diff options
| author | Maxim Cournoyer <maxim@guixotic.coop> | 2025-09-03 17:30:41 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-09-03 20:30:49 +0900 |
| commit | c5da26f40277d55e2ceb4c4cfc75e51397d81cd6 (patch) | |
| tree | 404ed2b3c12cf86229e036e86592d77df3de2cad /gnu/packages/virtualization.scm | |
| parent | 261a1065d8975553b6e2b4d70d1adc7e5a31d88b (diff) | |
gnu: qemu: Reinstate the bios-tables test.
* gnu/packages/virtualization.scm (qemu): Add comment.
[source] <patches>: Remove qemu-disable-bios-tables-test.patch
[#:phases] {replace-firmwares}: Adjust file names.
* gnu/packages/patches/qemu-disable-bios-tables-test.patch: Delete file.
* gnu/local.mk: De-register it.
Change-Id: I9835c21533ce7217d3928f5c02db8a0355af89c8
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 022cce9c6e7..2c686a09284 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -197,6 +197,9 @@ (define-public qemu (package (name "qemu") + ;; Do not forget to update the various firmware used by QEMU, and sync the + ;; configuration options used by the seabios-qemu package with those + ;; provided by QEMU. (version "10.1.0") (source (origin @@ -206,7 +209,6 @@ (sha256 (base32 "0ldyh3qia7zwv0xq6f67cp567i6ma1hb11gsqaz3x9qcnm4p6lg0")) (patches (search-patches "qemu-build-info-manual.patch" - "qemu-disable-bios-tables-test.patch" "qemu-fix-agent-paths.patch" "qemu-fix-test-virtio-version.patch")) (modules '((guix build utils))) @@ -302,11 +304,11 @@ (allowed-differences ;; Ignore minor differences (addresses etc) in the firmware ;; data tables compared to what the test suite expects. - '("tests/data/acpi/pc/SSDT.dimmpxm" - "tests/data/acpi/pc/DSDT.dimmpxm" - "tests/data/acpi/pc/ERST.acpierst" - "tests/data/acpi/q35/ERST.acpierst" - "tests/data/acpi/q35/DSDT.cxl")) + '("tests/data/acpi/x86/pc/SSDT.dimmpxm" + "tests/data/acpi/x86/pc/DSDT.dimmpxm" + "tests/data/acpi/x86/pc/ERST.acpierst" + "tests/data/acpi/x86/q35/ERST.acpierst" + "tests/data/acpi/x86/q35/DSDT.cxl")) (allowed-differences-whitelist (open-file "tests/qtest/bios-tables-test-allowed-diff.h" "a"))) |