From b2319b086cf16263e1cbc822bb7cf7da562458d2 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 20 May 2021 22:33:08 +0300 Subject: [PATCH] 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. --- nixos/lib/test-driver/test-driver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 270a5969cda5..56b941fa8b67 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 "