All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Adjust deprecated QEMU device name.
@ 2021-06-13 13:11 Marius Bakke
  2021-07-07 13:51 ` Daniel Kiper
  0 siblings, 1 reply; 5+ messages in thread
From: Marius Bakke @ 2021-06-13 13:11 UTC (permalink / raw)
  To: grub-devel

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



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] Adjust deprecated QEMU device name.
  2021-06-13 13:11 [PATCH] Adjust deprecated QEMU device name Marius Bakke
@ 2021-07-07 13:51 ` Daniel Kiper
  2021-07-16 16:22   ` Dimitri John Ledkov
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Kiper @ 2021-07-07 13:51 UTC (permalink / raw)
  To: Marius Bakke; +Cc: grub-devel

On Sun, Jun 13, 2021 at 03:11:51PM +0200, Marius Bakke wrote:
> The 'ide-drive' device was removed in QEMU 6.0.

Could you add your Signed-off-by?

> * tests/ahci_test.in (outfile): s/ide-drive/ide-hd/

Please drop this.

> ---
>  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

Is it possible to check QEMU version here and use correct variant then?

Daniel


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] Adjust deprecated QEMU device name.
  2021-07-07 13:51 ` Daniel Kiper
@ 2021-07-16 16:22   ` Dimitri John Ledkov
  2021-07-21 15:19     ` Daniel Kiper
  0 siblings, 1 reply; 5+ messages in thread
From: Dimitri John Ledkov @ 2021-07-16 16:22 UTC (permalink / raw)
  To: The development of GNU GRUB

On Wed, Jul 7, 2021 at 2:52 PM Daniel Kiper <dkiper@net-space.pl> wrote:
>
> On Sun, Jun 13, 2021 at 03:11:51PM +0200, Marius Bakke wrote:
> > The 'ide-drive' device was removed in QEMU 6.0.
>
> Could you add your Signed-off-by?
>
> > * tests/ahci_test.in (outfile): s/ide-drive/ide-hd/
>
> Please drop this.
>
> > ---
> >  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
>
> Is 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.

-- 
Regards,

Dimitri.


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] Adjust deprecated QEMU device name.
  2021-07-16 16:22   ` Dimitri John Ledkov
@ 2021-07-21 15:19     ` Daniel Kiper
  2021-07-22 10:33       ` Marius Bakke
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Kiper @ 2021-07-21 15:19 UTC (permalink / raw)
  To: Dimitri John Ledkov, Marius Bakke; +Cc: The development of GNU GRUB

On Fri, Jul 16, 2021 at 05:22:42PM +0100, Dimitri John Ledkov wrote:
> On Wed, Jul 7, 2021 at 2:52 PM Daniel Kiper <dkiper@net-space.pl> wrote:
> >
> > On Sun, Jun 13, 2021 at 03:11:51PM +0200, Marius Bakke wrote:
> > > The 'ide-drive' device was removed in QEMU 6.0.
> >
> > Could you add your Signed-off-by?
> >
> > > * tests/ahci_test.in (outfile): s/ide-drive/ide-hd/
> >
> > Please drop this.
> >
> > > ---
> > >  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
> >
> > Is 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 <daniel.kiper@oracle.com> then...

Marius, I will add your Signed-off-by if you do not object.

Thanks,

Daniel


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] Adjust deprecated QEMU device name.
  2021-07-21 15:19     ` Daniel Kiper
@ 2021-07-22 10:33       ` Marius Bakke
  0 siblings, 0 replies; 5+ messages in thread
From: Marius Bakke @ 2021-07-22 10:33 UTC (permalink / raw)
  To: Daniel Kiper, Dimitri John Ledkov; +Cc: The development of GNU GRUB

[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]

Daniel Kiper <dkiper@net-space.pl> skriver:

> On Fri, Jul 16, 2021 at 05:22:42PM +0100, Dimitri John Ledkov wrote:
>> On Wed, Jul 7, 2021 at 2:52 PM Daniel Kiper <dkiper@net-space.pl> wrote:
>> >
>> > On Sun, Jun 13, 2021 at 03:11:51PM +0200, Marius Bakke wrote:
>> > > The 'ide-drive' device was removed in QEMU 6.0.
>> >
>> > Could you add your Signed-off-by?
>> >
>> > > * tests/ahci_test.in (outfile): s/ide-drive/ide-hd/
>> >
>> > Please drop this.
>> >
>> > > ---
>> > >  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
>> >
>> > Is 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 <daniel.kiper@oracle.com> then...
>
> Marius, I will add your Signed-off-by if you do not object.

Sounds good, thank you!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-22 10:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-13 13:11 [PATCH] Adjust deprecated QEMU device name Marius Bakke
2021-07-07 13:51 ` Daniel Kiper
2021-07-16 16:22   ` Dimitri John Ledkov
2021-07-21 15:19     ` Daniel Kiper
2021-07-22 10:33       ` Marius Bakke

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.