diff options
| author | Jacek Galowicz <jacek@galowicz.de> | 2021-05-21 20:47:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 20:47:47 +0200 |
| commit | 5d05391846dec819e72c0b5d68922746bd0bedb7 (patch) | |
| tree | 6362bbe98c2e2cdf793007d9692703862bc868d6 /nixos | |
| parent | da4a86ac3d0f8aab880f93c872be3e64fe5bcbb0 (diff) | |
| parent | b2319b086cf16263e1cbc822bb7cf7da562458d2 (diff) | |
| download | nixpkgs-5d05391846dec819e72c0b5d68922746bd0bedb7.tar nixpkgs-5d05391846dec819e72c0b5d68922746bd0bedb7.tar.gz nixpkgs-5d05391846dec819e72c0b5d68922746bd0bedb7.tar.bz2 nixpkgs-5d05391846dec819e72c0b5d68922746bd0bedb7.tar.lz nixpkgs-5d05391846dec819e72c0b5d68922746bd0bedb7.tar.xz nixpkgs-5d05391846dec819e72c0b5d68922746bd0bedb7.tar.zst nixpkgs-5d05391846dec819e72c0b5d68922746bd0bedb7.zip | |
Merge pull request #123823 from misuzu/test-driver-usb-boot-speedup
nixos/test-driver: use usb-ehci controller instead of piix3-usb-uhci
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 3 |
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 6b868366e97..e216e566f28 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -316,8 +316,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 " |