about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/qemu
diff options
context:
space:
mode:
authorArnout Engelen <arnout@bzzt.net>2022-05-08 17:34:45 +0200
committerArnout Engelen <arnout@bzzt.net>2022-05-08 17:46:54 +0200
commit218a48c8491968735af9bb2cd87475206a6310e1 (patch)
tree3c0171341d26d7a2a07f88de60f071a99db96b48 /pkgs/applications/virtualization/qemu
parentcbe587c735b734405f56803e267820ee1559e6c1 (diff)
downloadnixlib-218a48c8491968735af9bb2cd87475206a6310e1.tar
nixlib-218a48c8491968735af9bb2cd87475206a6310e1.tar.gz
nixlib-218a48c8491968735af9bb2cd87475206a6310e1.tar.bz2
nixlib-218a48c8491968735af9bb2cd87475206a6310e1.tar.lz
nixlib-218a48c8491968735af9bb2cd87475206a6310e1.tar.xz
nixlib-218a48c8491968735af9bb2cd87475206a6310e1.tar.zst
nixlib-218a48c8491968735af9bb2cd87475206a6310e1.zip
qemu: stabilize USB EHCI
This patch fixes a problem that caused the NixOS tests that tested booting
from USB to fail periodically.

Fixes #15690, fixes #104642, fixes #170803

Also submitted upstream at https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html
Diffstat (limited to 'pkgs/applications/virtualization/qemu')
-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 ac661ea330c1..9f9b0389cedf 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -103,6 +103,12 @@ stdenv.mkDerivation rec {
       sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM=";
       revert = true;
     })
+    # make nixos tests that boot from USB more stable
+    # https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html
+    (fetchpatch {
+      url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch";
+      sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o=";
+    })
   ]
     ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;