@@ 2199,7 2199,6 @@ dist_patch_DATA = \
%D%/packages/patches/qdigidoc-bundle-config-files.patch \
%D%/packages/patches/qdigidoc-bundle-tsl-files.patch \
%D%/packages/patches/qemu-build-info-manual.patch \
- %D%/packages/patches/qemu-disable-bios-tables-test.patch \
%D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qemu-glibc-2.30.patch \
%D%/packages/patches/qemu-fix-agent-paths.patch \
@@ 1,56 0,0 @@
-diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
-index 669d07c06b..3399c1043a 100644
---- a/tests/qtest/meson.build
-+++ b/tests/qtest/meson.build
-@@ -1,7 +1,6 @@
- slow_qtests = {
- 'ahci-test': 150,
- 'aspeed_smc-test': 360,
-- 'bios-tables-test' : 910,
- 'cdrom-test' : 610,
- 'device-introspect-test' : 720,
- 'ide-test' : 120,
-@@ -102,9 +101,6 @@ qtests_i386 = \
- config_all_devices.has_key('CONFIG_Q35') and \
- config_all_devices.has_key('CONFIG_VIRTIO_PCI') and \
- slirp.found() ? ['virtio-net-failover'] : []) + \
-- (unpack_edk2_blobs and \
-- config_all_devices.has_key('CONFIG_HPET') and \
-- config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \
- qtests_pci + \
- qtests_cxl + \
- [
-@@ -148,7 +144,6 @@ qtests_hppa = \
-
- qtests_loongarch64 = qtests_filter + \
- (config_all_devices.has_key('CONFIG_LOONGARCH_VIRT') ? ['numa-test'] : []) + \
-- (unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
- ['boot-serial-test',
- 'cpu-plug-test']
-
-@@ -253,7 +248,6 @@ qtests_arm = \
-
- # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
- qtests_aarch64 = \
-- (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
- (config_all_accel.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \
- ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \
- (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
-@@ -281,8 +275,7 @@ qtests_s390x = \
- qtests_riscv32 = \
- (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : [])
-
--qtests_riscv64 = ['riscv-csr-test'] + \
-- (unpack_edk2_blobs ? ['bios-tables-test'] : [])
-+qtests_riscv64 = ['riscv-csr-test']
-
- qos_test_ss = ss.source_set()
- qos_test_ss.add(
-@@ -371,7 +364,6 @@ qtests = {
- 'aspeed_smc-test': files('aspeed-smc-utils.c', 'aspeed_smc-test.c'),
- 'ast2700-hace-test': files('aspeed-hace-utils.c', 'ast2700-hace-test.c'),
- 'ast2700-smc-test': files('aspeed-smc-utils.c', 'ast2700-smc-test.c'),
-- 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'],
- 'cdrom-test': files('boot-sector.c'),
- 'dbus-vmstate-test': files('migration/migration-qmp.c',
- 'migration/migration-util.c') + dbus_vmstate1,
@@ 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")))