summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorLászló Vaskó <1771332+vlaci@users.noreply.github.com>2021-11-11 14:15:24 +0100
committerAlyssa Ross <hi@alyssa.is>2021-11-22 02:16:40 +0000
commit7ea3e0f3f24780c8344492a494c905947e038d7f (patch)
treea5dca5e2eda6faa74d5b129833a642c3e99645b9 /pkgs/applications/virtualization
parent69e914bdb3289851d96cefa763723ab2001f217f (diff)
downloadnixpkgs-7ea3e0f3f24780c8344492a494c905947e038d7f.tar
nixpkgs-7ea3e0f3f24780c8344492a494c905947e038d7f.tar.gz
nixpkgs-7ea3e0f3f24780c8344492a494c905947e038d7f.tar.bz2
nixpkgs-7ea3e0f3f24780c8344492a494c905947e038d7f.tar.lz
nixpkgs-7ea3e0f3f24780c8344492a494c905947e038d7f.tar.xz
nixpkgs-7ea3e0f3f24780c8344492a494c905947e038d7f.tar.zst
nixpkgs-7ea3e0f3f24780c8344492a494c905947e038d7f.zip
qemu: fix managedsave (snapshot creation) with QXL video device
Backport patch from 6.2.0-rc0
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index c230fac1e61..7442f883b5f 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -112,6 +112,12 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch";
       sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M=";
     })
+    # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release.
+    (fetchpatch {
+      name = "qxl-fix-pre-save-logic.patch";
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch";
+      sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8=";
+    })
   ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch
     ++ lib.optionals stdenv.hostPlatform.isMusl [
     ./sigrtminmax.patch