From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OMuBG1Yb8GQ0mwAAG6o9tA:P1 (envelope-from ) for ; Thu, 31 Aug 2023 06:47:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OMuBG1Yb8GQ0mwAAG6o9tA (envelope-from ) for ; Thu, 31 Aug 2023 06:47:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D92C3416AF for ; Thu, 31 Aug 2023 06:47:17 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=o3Hz6KC5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693457238; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=3ujtghmPGwxYGYOmmuuXwSYQ2mpKqWsRsQMJ5WP/Utg=; b=bO4wTKCK+++op0SykpWliOYxs3DvgPhVAnFQ3I5OdqeopWIgPuzv6ye4Oxvbqw9OxGzW25 CIEe4cGiE61xJMwtMZXZyG514LIWaeSrM3i/1gTvWfuEahxaUGY5W/YuuUxmc7kpQh2ofe bbDe5kDmhg0hDb9VMorzD/nI5x3ASuzaOgUEkAVGFuI264wgA1eFQMYgytEUcljrPpudcl naunPK1875p63Yt52cnl3Yms4edRST5iW1GmTkGSDB3fgzK/e85aGGgBd/aIH/mdKkWyQ3 OMfl5Co8VonfLOlVKhDepB9uyEZbgC/2jafY/NmLARQn8Dn5JYD7BwGPisnZjw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693457238; a=rsa-sha256; cv=none; b=YVRB3Nxkwjlc3lIS3xmoCoemHB3W+d/beFBqTGmKjXzlJPU+UM0DoMMaZT8dw+cfpc2NFs BYaaDInjwWROxoGAby840hzDf35s2+5GkbQna0qlOsMLYmeO8ttqIZCjkINHfWNQJw0rvZ GlA5Xdaz06pVcBlrDOetT9f5yhEwat1vTt5HwZbKoEsmWlVTZeYDW3MGfSUolPzmdHPC09 LX6uEqD3bqYc5UdQjcECMZoI6eXWcw7Wcpg6jSF48o2ODnScHixsA8GMj4vGrol2ncA1ZB 4XYwEGu+FkxdgGruGsLR49cQ+0cIs2A33VDtV+Vx6+h0J/Km63whPJD/+RCs0g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=o3Hz6KC5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbZa4-00023l-D4; Thu, 31 Aug 2023 00:46:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZa2-00022Z-H0 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZa2-000351-91 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbZaA-0000ow-62 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65645] [PATCH 1/3] gnu: qemu: Update to 7.2.4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 04:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65645 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65645@debbugs.gnu.org, maxim.cournoyer@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org, maxim.cournoyer@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.16934571673049 (code B ref -1); Thu, 31 Aug 2023 04:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 04:46:07 +0000 Received: from localhost ([127.0.0.1]:54558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZG-0000n4-ON for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:07 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZB-0000mX-Tr for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZYy-0001pQ-9W for guix-patches@gnu.org; Thu, 31 Aug 2023 00:45:48 -0400 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZYu-0002uF-ME for guix-patches@gnu.org; Thu, 31 Aug 2023 00:45:47 -0400 Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-40a9918ec08so2697521cf.0 for ; Wed, 30 Aug 2023 21:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693457142; x=1694061942; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3ujtghmPGwxYGYOmmuuXwSYQ2mpKqWsRsQMJ5WP/Utg=; b=o3Hz6KC5fJGIMomIqBmjbNp3vbI+Xh83LcsyfvPkRjtKRFCYaWQhSTlRzd0Wu2fI+6 rv2Y0HKRrL/x0QkWGhynA4eHDaCZ0h3uMgPSUzZ/kgZuhdJ2h53290OSYM9i47oElGwS nDF9beV2w1I5ZPYLNkcXK+DudtsJF0kN3YmJx7kdytxMW4GFqE8SC1Yd6wqNb5efBrj7 9EAhULQNJR4QYDraTrpMCVV+cWIqmS7AdyyftOEqyYLSuGC18LYPrOLKEItlut2cxfZ1 Liub5PNPdG7r5+zDydv3xhlfZla95jHsh0+nyBQALnOWLcb9zhUghdo5mxuMfi5/eMfy CKrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693457142; x=1694061942; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3ujtghmPGwxYGYOmmuuXwSYQ2mpKqWsRsQMJ5WP/Utg=; b=IliCsJv4BrIdodjslM9uPXL/xRY1rI5nERN+ajV85CBf+VLNJ/Qz7OYviX/5DBCkV7 p6hMYcOksWGy6YwUn/XUbG/EURxyIS6F4YAbmoeyxs6wcuAyoNcnDaXiMkHt97nnqWGu dt+WbAuFQwgYJfRgY1vmseFtXoVstNv6YHebJLKOHS7f74ZZkf+2oVhh4DjbyVHvn892 uVocvtwfKVRDq8vA/qWcnOSTUNMkpMEnUPeoRcivW5n+tsritDgUgUsvrWLjO9WcymcQ 1BIyQtR+HFfgxljHnfzP/taJDmc77jw5PpLkQn5fyoq2nZEpdS8tTA01wFZWR/xGfIFa Bx5A== X-Gm-Message-State: AOJu0Yy8QIu92AALuPM272FLFKaxvKbGhUZExQmMrd2epd4ivxmi6R5g OG6JkjMGEA5WWrgU99sIUtkuGqX64P8= X-Google-Smtp-Source: AGHT+IEPqUEeNiI1QofJlvtTq8SYckRLp5aEaIItI0KJuP5w8BFLg+fURbyBrJeVWs73tmkQ20hvaA== X-Received: by 2002:a0c:b701:0:b0:63d:7214:638e with SMTP id t1-20020a0cb701000000b0063d7214638emr1659836qvd.56.1693457141743; Wed, 30 Aug 2023 21:45:41 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-23.b2b2c.ca. [72.10.128.23]) by smtp.gmail.com with ESMTPSA id p17-20020a0ce191000000b0064f4d3bc78csm277003qvl.61.2023.08.30.21.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 21:45:41 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 31 Aug 2023 00:45:26 -0400 Message-ID: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 5.78 X-Spam-Score: 5.78 X-Migadu-Queue-Id: D92C3416AF X-Migadu-Scanner: mx2.migadu.com X-TUID: M/Bz96AXmFxK * gnu/packages/virtualization.scm (qemu): Update to 7.2.4. [source] : Replace qemu-disable-aarch64-migration-test.patch with qemu-disable-some-qtests-tests.patch. : Adjust for dtc relocation and meson and sgabios removal. [arguments] : Remove --meson flag. Remove sgabios from the --firmwarepath value. : Adjust replace-firmwares and delete-firmwares phases for sgabios removal. [inputs]: Remove sgabios. (qemu-minimal): Use package/inherit, which is more appropriate for a package variant. [arguments]: New disable-extra-tests phase. * gnu/packages/patches/qemu-disable-aarch64-migration-test.patch: Delete file. * gnu/packages/patches/qemu-disable-some-qtests-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- .../qemu-disable-aarch64-migration-test.patch | 13 ----- .../qemu-disable-some-qtests-tests.patch | 52 +++++++++++++++++++ gnu/packages/virtualization.scm | 43 +++++++-------- 4 files changed, 71 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/qemu-disable-aarch64-migration-test.patch create mode 100644 gnu/packages/patches/qemu-disable-some-qtests-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 48187d7e64..0683a87492 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1864,7 +1864,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-werkzeug-tests.patch \ %D%/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ - %D%/packages/patches/qemu-disable-aarch64-migration-test.patch \ + %D%/packages/patches/qemu-disable-some-qtests-tests.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 \ diff --git a/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch b/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch deleted file mode 100644 index bf60ed23bb..0000000000 --- a/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -Disable the qtest-aarch64/migration-test, which sometimes fail non-deterministically. -See: https://gitlab.com/qemu-project/qemu/-/issues/1230. - ---- qemu-7.1.0/tests/qtest/meson.build.old 1969-12-31 19:00:01.000000000 -0500 -+++ qemu-7.1.0/tests/qtest/meson.build 2022-09-26 11:11:05.434209797 -0400 -@@ -219,7 +219,6 @@ - ['arm-cpu-features', - 'numa-test', - 'boot-serial-test', -- 'migration-test', - 'bcm2835-dma-test'] - - qtests_s390x = \ diff --git a/gnu/packages/patches/qemu-disable-some-qtests-tests.patch b/gnu/packages/patches/qemu-disable-some-qtests-tests.patch new file mode 100644 index 0000000000..f60698de8f --- /dev/null +++ b/gnu/packages/patches/qemu-disable-some-qtests-tests.patch @@ -0,0 +1,52 @@ +Disable the qtest-aarch64/migration-test, which sometimes fail +non-deterministically (see: +https://gitlab.com/qemu-project/qemu/-/issues/1230). + +Also disable the bios-tables-test, which may fail on older machines (see: +https://gitlab.com/qemu-project/qemu/-/issues/1098). + +--- qemu-8.1.0/tests/qtest/meson.build.old 2023-08-30 11:48:27.871146249 -0400 ++++ qemu-8.1.0/tests/qtest/meson.build 2023-08-30 13:53:25.994084948 -0400 +@@ -1,6 +1,5 @@ + slow_qtests = { + 'ahci-test' : 60, +- 'bios-tables-test' : 120, + 'boot-serial-test' : 60, + 'migration-test' : 150, + 'npcm7xx_pwm-test': 150, +@@ -81,9 +80,6 @@ + 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 + \ + ['fdc-test', +@@ -212,7 +208,6 @@ + + # 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.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'] : []) + \ +@@ -222,8 +217,7 @@ + config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ + ['arm-cpu-features', + 'numa-test', +- 'boot-serial-test', +- 'migration-test'] ++ 'boot-serial-test'] + + qtests_s390x = \ + qtests_filter + \ +@@ -301,7 +295,6 @@ + endif + + qtests = { +- 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'], + 'cdrom-test': files('boot-sector.c'), + 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1, + 'erst-test': files('erst-test.c'), diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9952dd125a..4ae0049269 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020, 2021, 2022 Marius Bakke -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021, 2022 Pierre Langlois @@ -164,16 +164,15 @@ (define (qemu-patch commit file-name sha256-bv) (define-public qemu (package (name "qemu") - (version "7.2.4") + (version "8.1.0") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 - (base32 "0795l8xsy67fnh4mbdz40jm880iisd7q6d7ly6nfzpac3gjr8zyf")) - (patches (search-patches "qemu-build-info-manual.patch" - "qemu-disable-aarch64-migration-test.patch" + (base32 "0m8fbyr3xv6gi95ma0sksxfqmyj3pi4zcrgg5rvd8d73k08i033i")) + (patches (search-patches "qemu-disable-some-qtests-tests.patch" "qemu-fix-agent-paths.patch")) (modules '((guix build utils))) (snippet @@ -182,8 +181,6 @@ (define-public qemu (with-directory-excursion "pc-bios" ;; Delete firmwares provided by SeaBIOS. (for-each delete-file (find-files "." "^(bios|vgabios).*\\.bin$")) - ;; Delete SGABIOS. - (delete-file "sgabios.bin") ;; Delete ppc64 OpenBIOS. TODO: Remove sparc32 and sparc64 too ;; once they are supported in Guix. (delete-file "openbios-ppc") @@ -194,12 +191,11 @@ (define-public qemu (for-each delete-file (find-files "." "^(efi|pxe)-.*\\.rom$"))) ;; Delete bundled code that we provide externally. (for-each delete-file-recursively - '("dtc" "meson" + '("subprojects/dtc" "roms/ipxe" "roms/openbios" "roms/opensbi" - "roms/seabios" - "roms/sgabios")))))) + "roms/seabios")))))) (outputs '("out" "static" "doc")) ;5.3 MiB of HTML docs (build-system gnu-build-system) (arguments @@ -210,7 +206,6 @@ (define-public qemu (not (string=? "i686-linux" (%current-system)))) #:configure-flags #~(let ((gcc (search-input-file %build-inputs "/bin/gcc")) - (meson (search-input-file %build-inputs "bin/meson")) (openbios (search-input-file %build-inputs "share/qemu/openbios-ppc")) (opensbi (search-input-file @@ -218,25 +213,20 @@ (define-public qemu "share/qemu/opensbi-riscv64-generic-fw_dynamic.bin")) (seabios (search-input-file %build-inputs "share/qemu/bios.bin")) - (sgabios (search-input-file %build-inputs - "/share/qemu/sgabios.bin")) (ipxe (search-input-file %build-inputs "share/qemu/pxe-virtio.rom")) (out #$output)) (list (string-append "--cc=" gcc) ;; Some architectures insist on using HOST_CC. (string-append "--host-cc=" gcc) - (string-append "--meson=" meson) (string-append "--prefix=" out) - "--sysconfdir=/etc" "--enable-fdt=system" (string-append "--firmwarepath=" out "/share/qemu:" (dirname seabios) ":" (dirname ipxe) ":" (dirname openbios) ":" - (dirname opensbi) ":" - (dirname sgabios)) + (dirname opensbi)) (string-append "--smbd=" out "/libexec/samba-wrapper") "--disable-debug-info" ;for space considerations ;; The binaries need to be linked against -lrt. @@ -257,7 +247,6 @@ (define-public qemu (let* ((seabios (dirname (search-input-file inputs "share/qemu/bios.bin"))) (seabios-firmwares (find-files seabios "\\.bin$")) - (sgabios (search-input-file inputs "share/qemu/sgabios.bin")) (ipxe (dirname (search-input-file inputs "share/qemu/pxe-virtio.rom"))) (ipxe-firmwares (find-files ipxe "\\.rom$")) @@ -282,7 +271,7 @@ (define-public qemu (for-each (lambda (file) (symlink file (basename file))) (append seabios-firmwares ipxe-firmwares - (list openbios opensbi-riscv64 sgabios)))) + (list openbios opensbi-riscv64)))) (for-each (lambda (file) (format allowed-differences-whitelist "\"~a\",~%" file)) @@ -405,8 +394,7 @@ (define-public qemu (for-each delete-file (append '("openbios-ppc" - "opensbi-riscv64-generic-fw_dynamic.bin" - "sgabios.bin") + "opensbi-riscv64-generic-fw_dynamic.bin") (find-files "." "^(vga)?bios(-[a-z0-9-]+)?\\.bin$") (find-files "." "^(efi|pxe)-.*\\.rom$")))))) ;; Create a wrapper for Samba. This allows QEMU to use Samba without @@ -457,7 +445,6 @@ (define-public qemu pulseaudio sdl2 seabios-qemu - sgabios spice usbredir util-linux @@ -512,8 +499,7 @@ (define-public qemu (define-public qemu-minimal ;; QEMU without GUI support, only supporting the host's architecture - (package - (inherit qemu) + (package/inherit qemu (name "qemu-minimal") (outputs '("out" "doc")) (synopsis @@ -556,7 +542,14 @@ (define-public qemu-minimal #~(modify-phases #$phases (delete 'configure-user-static) (delete 'build-user-static) - (delete 'install-user-static))))) + (delete 'install-user-static) + (add-after 'disable-unusable-tests 'disable-extra-tests + (lambda _ + ;; Interesting, the iothreads-commit-active test only fails in + ;; qemu-minimal, not the complete variant (see: + ;; https://gitlab.com/qemu-project/qemu/-/issues/1855). + (delete-file + "tests/qemu-iotests/tests/iothreads-commit-active"))))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (native-inputs (filter (lambda (input) base-commit: d6966b8a5b4f2ddda2bc685b9642e7a1c2cbe17c -- 2.41.0