Adjust deprecated QEMU device name.
PATCH 1/1 Adjust deprecated QEMU device name.
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(-)
tests/ahci_test.in +1 -1
@@ -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
Signature · 1 line
2.31.1
Quoted 1 line · Marius Bakke
The 'ide-drive' device was removed in QEMU 6.0.
Could you add your Signed-off-by?
Quoted 1 line
* tests/ahci_test.in (outfile): s/ide-drive/ide-hd/
Please drop this.
Quoted 9 lines
--- tests/ahci_test.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/ahci_test.in +0
-0
tests/ahci_test.in echo "hello" > "$outfile" · line 44
Quoted 5 lines
tests/ahci_test.in +1
-1@@ -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
Is it possible to check QEMU version here and use correct variant then?
Daniel
Quoted 20 lines · Daniel Kiper
Quoted 1 line · Marius Bakke
The 'ide-drive' device was removed in QEMU 6.0.
Could you add your Signed-off-by?
Quoted 1 line
* tests/ahci_test.in (outfile): s/ide-drive/ide-hd/
Please drop this.
Quoted 10 lines
--- tests/ahci_test.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/ahci_test.in +0
-0@@ -41,7 +41,7 @@ echo "hello" > "$outfile"
Quoted 7 lines
tests/ahci_test.in echo "hello" > "$outfile" · line 44
Quoted 4 lines
tests/ahci_test.in +1
-1tar 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" ]; thenIs it possible to check QEMU version here and use correct variant then?
ide-hd has been available for more than 10 years now in qemu, thus there shouldn't be any need for backwards compatible names.
Signature · 3 lines
Regards, Dimitri.
Quoted 23 lines · Dimitri John Ledkov
Quoted 22 lines · Daniel Kiper
Quoted 1 line · Marius Bakke
The 'ide-drive' device was removed in QEMU 6.0.
Could you add your Signed-off-by?
Quoted 1 line
* tests/ahci_test.in (outfile): s/ide-drive/ide-hd/
Please drop this.
Quoted 12 lines
--- tests/ahci_test.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/ahci_test.in +0
-0@@ -41,7 +41,7 @@ echo "hello" > "$outfile" tar cf "$imgfile" "$outfile"
Quoted 8 lines
Quoted 5 lines
tests/ahci_test.in echo "hello" > "$outfile" · line 44
Quoted 2 lines
tests/ahci_test.in +1
-1-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" ]; thenIs it possible to check QEMU version here and use correct variant then?
ide-hd has been available for more than 10 years now in qemu, thus there shouldn't be any need for backwards compatible names.
OK, Reviewed-by: Daniel Kiper <[email protected]> then...
Marius, I will add your Signed-off-by if you do not object.
Thanks,
Daniel
Daniel Kiper <[email protected]> skriver:
Quoted 30 lines · Dimitri John Ledkov
Quoted 29 lines · Daniel Kiper
Quoted 27 lines · Marius Bakke
Quoted 1 line
The 'ide-drive' device was removed in QEMU 6.0.
Could you add your Signed-off-by?
Quoted 1 line
* tests/ahci_test.in (outfile): s/ide-drive/ide-hd/
Please drop this.
Quoted 9 lines
--- tests/ahci_test.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/ahci_test.in +0
-0tests/ahci_test.in echo "hello" > "$outfile" · line 44
Quoted 5 lines
tests/ahci_test.in +1
-1@@ -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" ]; thenIs it possible to check QEMU version here and use correct variant then?
Quoted 6 lines
Quoted 2 lines
ide-hd has been available for more than 10 years now in qemu, thus there shouldn't be any need for backwards compatible names.
OK, Reviewed-by: Daniel Kiper <[email protected]> then...
Marius, I will add your Signed-off-by if you do not object.
Sounds good, thank you!