]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
tests/ahci: Change "ide-drive" deprecated QEMU device name to "ide-hd"
authorMarius Bakke <marius@gnu.org>
Sun, 13 Jun 2021 13:11:51 +0000 (15:11 +0200)
committerDaniel Kiper <daniel.kiper@oracle.com>
Thu, 22 Jul 2021 13:24:12 +0000 (15:24 +0200)
The "ide-drive" device was removed in QEMU 6.0. The "ide-hd" has been
available for more than 10 years now in QEMU. Thus there shouldn't be
any need for backwards compatible names.

Signed-off-by: Marius Bakke <marius@gnu.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
tests/ahci_test.in

index 7df56046201e4c2e4a55bdcdd403853cde902268..d844fe680fd340ccd80340d3923f934811e60af7 100644 (file)
@@ -41,7 +41,7 @@ echo "hello" > "$outfile"
 
 tar cf "$imgfile" "$outfile"
 
-if [ "$(echo "nativedisk; source '(ahci0)/$outfile';" | "${grubshell}" --qemu-opts="-drive id=disk,file=$imgfile,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 " | tail -n 1)" != "Hello World" ]; then
+if [ "$(echo "nativedisk; source '(ahci0)/$outfile';" | "${grubshell}" --qemu-opts="-drive id=disk,file=$imgfile,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 " | tail -n 1)" != "Hello World" ]; then
    rm "$imgfile"
    rm "$outfile"
    exit 1