summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authormisuzu <bakalolka@gmail.com>2021-05-20 22:33:08 +0300
committermisuzu <bakalolka@gmail.com>2021-05-20 22:33:08 +0300
commitb2319b086cf16263e1cbc822bb7cf7da562458d2 (patch)
tree4d7f5cb5bcaa16b21ef363be6bdcae5250ec655a /nixos
parent7a1fbc38a4b538450ac0d42aec8a3e513b4d723e (diff)
downloadnixpkgs-b2319b086cf16263e1cbc822bb7cf7da562458d2.tar
nixpkgs-b2319b086cf16263e1cbc822bb7cf7da562458d2.tar.gz
nixpkgs-b2319b086cf16263e1cbc822bb7cf7da562458d2.tar.bz2
nixpkgs-b2319b086cf16263e1cbc822bb7cf7da562458d2.tar.lz
nixpkgs-b2319b086cf16263e1cbc822bb7cf7da562458d2.tar.xz
nixpkgs-b2319b086cf16263e1cbc822bb7cf7da562458d2.tar.zst
nixpkgs-b2319b086cf16263e1cbc822bb7cf7da562458d2.zip
nixos/test-driver: use usb-ehci controller instead of piix3-usb-uhci
On my system this change offers ~5X speed up of
nixosTests.boot.biosUsb and nixosTests.boot.uefiUsb tests.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/lib/test-driver/test-driver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 270a5969cda..56b941fa8b6 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -307,8 +307,9 @@ class Machine:
             start_command += "-cdrom " + args["cdrom"] + " "
 
         if "usb" in args:
+            # https://github.com/qemu/qemu/blob/master/docs/usb2.txt
             start_command += (
-                "-device piix3-usb-uhci -drive "
+                "-device usb-ehci -drive "
                 + "id=usbdisk,file="
                 + args["usb"]
                 + ",if=none,readonly "