From c5da26f40277d55e2ceb4c4cfc75e51397d81cd6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Sep 2025 17:30:41 +0900 Subject: gnu: qemu: Reinstate the bios-tables test. * gnu/packages/virtualization.scm (qemu): Add comment. [source] : 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 --- gnu/packages/virtualization.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/virtualization.scm') 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"))) -- cgit v1.3