From d891d7897001d1dbfe4ec93c6f72fc4f51fb0627 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 17 Mar 2024 23:25:11 -0400
Subject: gnu: qemu: Update to 8.2.2.

* gnu/packages/virtualization.scm (qemu): Update to 8.2.2.
[source]: Adjust snippet.
[arguments] <phases>: Patch tests sources with native /bin/sh.  Also patch
/bin/sh references in migration/migration.c, util/envlist.c files.
* gnu/packages/patches/qemu-disable-some-qtests-tests.patch: Delete file.
* gnu/packages/patches/qemu-disable-bios-tables-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Update accordingly.

Change-Id: Ia44017e4d567ede1995ae707ed6acbb1ec5194fe
---
 gnu/packages/virtualization.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/virtualization.scm')

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 295649237c..f1d40df1f1 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -169,16 +169,16 @@
 (define-public qemu
   (package
     (name "qemu")
-    (version "8.1.3")
+    (version "8.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.qemu.org/qemu-"
                            version ".tar.xz"))
        (sha256
-        (base32 "1fv5wbxpjxqzv10bdlq0ykgqfmzqx4s8yfch9zvqcm8h0il1gk23"))
+        (base32 "1wy45fbf4816l4ylsz8b8cbypva9apcdnvlgqfr586icp30lcww4"))
        (patches (search-patches "qemu-build-info-manual.patch"
-                                "qemu-disable-some-qtests-tests.patch"
+                                "qemu-disable-bios-tables-test.patch"
                                 "qemu-fix-agent-paths.patch"))
        (modules '((guix build utils)))
        (snippet
@@ -197,7 +197,7 @@
              (for-each delete-file (find-files "." "^(efi|pxe)-.*\\.rom$")))
            ;; Delete bundled code that we provide externally.
            (for-each delete-file-recursively
-                     '("subprojects/dtc"
+                     '("roms/u-boot/scripts/dtc"
                        "roms/ipxe"
                        "roms/openbios"
                        "roms/opensbi"
@@ -322,10 +322,18 @@
             (lambda* (#:key native-inputs inputs #:allow-other-keys)
               ;; Ensure the executables created by these source files reference
               ;; /bin/sh from the store so they work inside the build container.
-              (substitute* '("block/cloop.c" "migration/exec.c"
-                             "net/tap.c" "tests/qtest/libqtest.c"
+              (substitute* '("block/cloop.c"
+                             "migration/exec.c"
+                             "migration/migration.c"
+                             "net/tap.c"
+                             "util/envlist.c")
+                (("/bin/sh")
+                 (search-input-file inputs "/bin/sh")))
+              ;; For tests, use the native /bin/sh is available.
+              (substitute* '("tests/qtest/libqtest.c"
                              "tests/qtest/vhost-user-blk-test.c")
-                (("/bin/sh") (search-input-file inputs "/bin/sh")))
+                (("/bin/sh")
+                 (search-input-file (or native-inputs inputs) "/bin/sh")))
               (substitute* "tests/qemu-iotests/testenv.py"
                 (("#!/usr/bin/env python3")
                  (string-append "#!" (search-input-file (or native-inputs inputs)
-- 
cgit v1.2.3