From a782620088319706827980bce6b04cbcad920de7 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 Jul 2018 12:29:44 +0100 Subject: [PATCH] tests: Fix qemu options for UHCI test qemu 2.12 removed the -usbdevice option. Use a more modern spelling instead, in line with other USB-related tests. Signed-off-by: Colin Watson Forwarded: https://lists.gnu.org/archive/html/grub-devel/2018-07/msg00114.html Last-Update: 2018-07-30 Patch-Name: tests-fix-uhci-qemu-options.patch --- tests/uhci_test.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/uhci_test.in b/tests/uhci_test.in index 89e2c1805..cd38aee90 100644 --- a/tests/uhci_test.in +++ b/tests/uhci_test.in @@ -41,7 +41,7 @@ echo "hello" > "$outfile" tar cf "$imgfile" "$outfile" -if [ "$(echo "nativedisk; source '(usb0)/$outfile';" | "${grubshell}" --qemu-opts="-usb -usbdevice disk:$imgfile" | tail -n 1)" != "Hello World" ]; then +if [ "$(echo "nativedisk; source '(usb0)/$outfile';" | "${grubshell}" --qemu-opts="-device ich9-usb-uhci1 -drive id=my_usb_disk,file=$imgfile,if=none -device usb-storage,drive=my_usb_disk" | tail -n 1)" != "Hello World" ]; then rm "$imgfile" rm "$outfile" exit 1 -- 2.39.5