From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lsPu6-0001aZ-Ub for mharc-grub-devel@gnu.org; Sun, 13 Jun 2021 09:11:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsPu6-0001Zs-3B for grub-devel@gnu.org; Sun, 13 Jun 2021 09:11:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41262) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsPu5-0004Nf-SR for grub-devel@gnu.org; Sun, 13 Jun 2021 09:11:53 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:42586 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsPu5-0007sE-Jp for grub-devel@gnu.org; Sun, 13 Jun 2021 09:11:53 -0400 From: Marius Bakke To: grub-devel@gnu.org Subject: [PATCH] Adjust deprecated QEMU device name. Date: Sun, 13 Jun 2021 15:11:51 +0200 Message-Id: <20210613131151.16607-1-marius@gnu.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2021 13:11:54 -0000 The 'ide-drive' device was removed in QEMU 6.0. * tests/ahci_test.in (outfile): s/ide-drive/ide-hd/ --- tests/ahci_test.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ahci_test.in b/tests/ahci_test.in index 7df560462..d844fe680 100644 --- a/tests/ahci_test.in +++ b/tests/ahci_test.in @@ -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 -- 2.31.1