diff options
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index dcd70b430b..81d81fc037 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org> -;;; Copyright © 2020-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020-2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com> @@ -93,6 +93,7 @@ #:use-module (gnu packages dns) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages engineering) #:use-module (gnu packages figlet) #:use-module (gnu packages file) #:use-module (gnu packages firmware) @@ -196,19 +197,20 @@ (define-public qemu (package (name "qemu") - (version "9.1.3") + ;; 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 (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 - (base32 "12dc3fpv6c6qvw89amjjbb6dgc2f1c1alfgn2nab7a8kxnh7f2j8")) + (base32 "0ldyh3qia7zwv0xq6f67cp567i6ma1hb11gsqaz3x9qcnm4p6lg0")) (patches (search-patches "qemu-build-info-manual.patch" - "qemu-disable-bios-tables-test.patch" - "qemu-disable-migration-test.patch" "qemu-fix-agent-paths.patch" - "qemu-glibc-2.41.patch")) + "qemu-fix-test-virtio-version.patch")) (modules '((guix build utils))) (snippet '(begin @@ -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"))) @@ -462,6 +464,16 @@ (lambda args (with-directory-excursion "../user-static" (apply (assoc-ref %standard-phases 'build) args)))) + (add-after 'install 'install-plugins + (lambda* (#:key outputs #:allow-other-keys) + (let ((plugin-dir (string-append + (assoc-ref outputs "out") + "/lib/qemu/plugins"))) + (mkdir-p plugin-dir) + (with-directory-excursion "contrib/plugins" + (for-each + (cut install-file <> plugin-dir) + (find-files "." "\\.so$")))))) (add-after 'install 'install-user-static (lambda* (#:key outputs #:allow-other-keys) (let ((static-bin (string-append @@ -524,6 +536,7 @@ exec smbd $@"))) '()) (list alsa-lib bash-minimal + capstone dtc glib gnutls ;for qcow2 disk encryption @@ -1761,7 +1774,7 @@ to integrate other virtualization mechanisms if needed.") `(,glib "bin") vala)) (propagated-inputs ;; ‘Required:’ by the installed .pc files. - (list glib libvirt libxml2 gobject-introspection)) + (list glib libvirt libxml2-next gobject-introspection)) (home-page "https://libvirt.org") (synopsis "GLib wrapper around libvirt") (description "libvirt-glib wraps the libvirt library to provide a |