* [Qemu-devel] [PATCH] iotests: Update output of 051 and 186 after commit 1454509726719e0933c
@ 2018-03-06 16:45 Alberto Garcia
2018-03-06 16:52 ` Thomas Huth
0 siblings, 1 reply; 5+ messages in thread
From: Alberto Garcia @ 2018-03-06 16:45 UTC (permalink / raw)
To: qemu-devel; +Cc: Alberto Garcia, Thomas Huth, Markus Armbruster
Signed-off-by: Alberto Garcia <berto@igalia.com>
---
tests/qemu-iotests/051.pc.out | 20 --------------------
tests/qemu-iotests/186.out | 22 +++-------------------
2 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index 830c11880a..b01f9a90d7 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) quit
-Testing: -drive if=scsi,media=cdrom
-QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
-quit
-
Testing: -drive if=ide
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
-Testing: -drive if=scsi
-QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with this machine type
-QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
-
Testing: -drive if=virtio
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
@@ -170,20 +160,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) quit
-Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on
-QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
-quit
-
Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
-Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
-QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
-quit
-
Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) quit
diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out
index c8377fe146..d83bba1a88 100644
--- a/tests/qemu-iotests/186.out
+++ b/tests/qemu-iotests/186.out
@@ -444,31 +444,15 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
Testing: -drive if=scsi,driver=null-co
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type
-info block
-scsi0-hd0 (NODE_NAME): null-co:// (null-co)
- Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
- Cache mode: writeback
-(qemu) quit
+(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: machine type does not support if=scsi,bus=0,unit=0
Testing: -drive if=scsi,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
-info block
-scsi0-cd0: [not inserted]
- Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
- Removable device: not locked, tray closed
-(qemu) quit
+(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
Testing: -drive if=scsi,driver=null-co,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
-info block
-scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
- Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
- Removable device: not locked, tray closed
- Cache mode: writeback
-(qemu) quit
+(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
Testing: -drive if=virtio,driver=null-co
QEMU X.Y.Z monitor - type 'help' for more information
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] iotests: Update output of 051 and 186 after commit 1454509726719e0933c
2018-03-06 16:45 [Qemu-devel] [PATCH] iotests: Update output of 051 and 186 after commit 1454509726719e0933c Alberto Garcia
@ 2018-03-06 16:52 ` Thomas Huth
2018-03-13 16:08 ` Kevin Wolf
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Huth @ 2018-03-06 16:52 UTC (permalink / raw)
To: Alberto Garcia, qemu-devel; +Cc: Markus Armbruster, Paolo Bonzini, Qemu-block
On 06.03.2018 17:45, Alberto Garcia wrote:
> Signed-off-by: Alberto Garcia <berto@igalia.com>
> ---
> tests/qemu-iotests/051.pc.out | 20 --------------------
> tests/qemu-iotests/186.out | 22 +++-------------------
> 2 files changed, 3 insertions(+), 39 deletions(-)
>
> diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
> index 830c11880a..b01f9a90d7 100644
> --- a/tests/qemu-iotests/051.pc.out
> +++ b/tests/qemu-iotests/051.pc.out
> @@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) quit
>
> -Testing: -drive if=scsi,media=cdrom
> -QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> -quit
> -
> Testing: -drive if=ide
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
>
> -Testing: -drive if=scsi
> -QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with this machine type
> -QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
> -
> Testing: -drive if=virtio
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
> @@ -170,20 +160,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) quit
>
> -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on
> -QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
> -quit
> -
> Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
>
> -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
> -QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
> -quit
> -
> Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) quit
Ack for that part.
> diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out
> index c8377fe146..d83bba1a88 100644
> --- a/tests/qemu-iotests/186.out
> +++ b/tests/qemu-iotests/186.out
> @@ -444,31 +444,15 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
>
> Testing: -drive if=scsi,driver=null-co
> QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type
> -info block
> -scsi0-hd0 (NODE_NAME): null-co:// (null-co)
> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> - Cache mode: writeback
> -(qemu) quit
> +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: machine type does not support if=scsi,bus=0,unit=0
>
> Testing: -drive if=scsi,media=cdrom
> QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> -info block
> -scsi0-cd0: [not inserted]
> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> - Removable device: not locked, tray closed
> -(qemu) quit
> +(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
>
> Testing: -drive if=scsi,driver=null-co,media=cdrom
> QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> -info block
> -scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> - Removable device: not locked, tray closed
> - Cache mode: writeback
> -(qemu) quit
> +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
That rather sounds like this "if=scsi" test should be removed now?
Thomas
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] iotests: Update output of 051 and 186 after commit 1454509726719e0933c
2018-03-06 16:52 ` Thomas Huth
@ 2018-03-13 16:08 ` Kevin Wolf
2018-03-13 16:22 ` Thomas Huth
0 siblings, 1 reply; 5+ messages in thread
From: Kevin Wolf @ 2018-03-13 16:08 UTC (permalink / raw)
To: Thomas Huth
Cc: Alberto Garcia, qemu-devel, Paolo Bonzini, Markus Armbruster,
Qemu-block
Am 06.03.2018 um 17:52 hat Thomas Huth geschrieben:
> On 06.03.2018 17:45, Alberto Garcia wrote:
> > Signed-off-by: Alberto Garcia <berto@igalia.com>
> > ---
> > tests/qemu-iotests/051.pc.out | 20 --------------------
> > tests/qemu-iotests/186.out | 22 +++-------------------
> > 2 files changed, 3 insertions(+), 39 deletions(-)
> >
> > diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
> > index 830c11880a..b01f9a90d7 100644
> > --- a/tests/qemu-iotests/051.pc.out
> > +++ b/tests/qemu-iotests/051.pc.out
> > @@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom
> > QEMU X.Y.Z monitor - type 'help' for more information
> > (qemu) quit
> >
> > -Testing: -drive if=scsi,media=cdrom
> > -QEMU X.Y.Z monitor - type 'help' for more information
> > -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> > -quit
> > -
> > Testing: -drive if=ide
> > QEMU X.Y.Z monitor - type 'help' for more information
> > (qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
> >
> > -Testing: -drive if=scsi
> > -QEMU X.Y.Z monitor - type 'help' for more information
> > -(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with this machine type
> > -QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
> > -
> > Testing: -drive if=virtio
> > QEMU X.Y.Z monitor - type 'help' for more information
> > (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
> > @@ -170,20 +160,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on
> > QEMU X.Y.Z monitor - type 'help' for more information
> > (qemu) quit
> >
> > -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on
> > -QEMU X.Y.Z monitor - type 'help' for more information
> > -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
> > -quit
> > -
> > Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
> > QEMU X.Y.Z monitor - type 'help' for more information
> > (qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
> >
> > -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
> > -QEMU X.Y.Z monitor - type 'help' for more information
> > -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
> > -quit
> > -
> > Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
> > QEMU X.Y.Z monitor - type 'help' for more information
> > (qemu) quit
>
> Ack for that part.
>
> > diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out
> > index c8377fe146..d83bba1a88 100644
> > --- a/tests/qemu-iotests/186.out
> > +++ b/tests/qemu-iotests/186.out
> > @@ -444,31 +444,15 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
> >
> > Testing: -drive if=scsi,driver=null-co
> > QEMU X.Y.Z monitor - type 'help' for more information
> > -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type
> > -info block
> > -scsi0-hd0 (NODE_NAME): null-co:// (null-co)
> > - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> > - Cache mode: writeback
> > -(qemu) quit
> > +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: machine type does not support if=scsi,bus=0,unit=0
> >
> > Testing: -drive if=scsi,media=cdrom
> > QEMU X.Y.Z monitor - type 'help' for more information
> > -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> > -info block
> > -scsi0-cd0: [not inserted]
> > - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> > - Removable device: not locked, tray closed
> > -(qemu) quit
> > +(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
> >
> > Testing: -drive if=scsi,driver=null-co,media=cdrom
> > QEMU X.Y.Z monitor - type 'help' for more information
> > -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> > -info block
> > -scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
> > - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> > - Removable device: not locked, tray closed
> > - Cache mode: writeback
> > -(qemu) quit
> > +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
>
> That rather sounds like this "if=scsi" test should be removed now?
I think, it actually sounds like a SCSI adapter should be added manually
now.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] iotests: Update output of 051 and 186 after commit 1454509726719e0933c
2018-03-13 16:08 ` Kevin Wolf
@ 2018-03-13 16:22 ` Thomas Huth
2018-03-13 16:37 ` Kevin Wolf
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Huth @ 2018-03-13 16:22 UTC (permalink / raw)
To: Kevin Wolf
Cc: Alberto Garcia, qemu-devel, Paolo Bonzini, Markus Armbruster,
Qemu-block
On 13.03.2018 17:08, Kevin Wolf wrote:
> Am 06.03.2018 um 17:52 hat Thomas Huth geschrieben:
>> On 06.03.2018 17:45, Alberto Garcia wrote:
>>> Signed-off-by: Alberto Garcia <berto@igalia.com>
>>> ---
>>> tests/qemu-iotests/051.pc.out | 20 --------------------
>>> tests/qemu-iotests/186.out | 22 +++-------------------
>>> 2 files changed, 3 insertions(+), 39 deletions(-)
>>>
>>> diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
>>> index 830c11880a..b01f9a90d7 100644
>>> --- a/tests/qemu-iotests/051.pc.out
>>> +++ b/tests/qemu-iotests/051.pc.out
>>> @@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> (qemu) quit
>>>
>>> -Testing: -drive if=scsi,media=cdrom
>>> -QEMU X.Y.Z monitor - type 'help' for more information
>>> -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
>>> -quit
>>> -
>>> Testing: -drive if=ide
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> (qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
>>>
>>> -Testing: -drive if=scsi
>>> -QEMU X.Y.Z monitor - type 'help' for more information
>>> -(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with this machine type
>>> -QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
>>> -
>>> Testing: -drive if=virtio
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
>>> @@ -170,20 +160,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> (qemu) quit
>>>
>>> -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on
>>> -QEMU X.Y.Z monitor - type 'help' for more information
>>> -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
>>> -quit
>>> -
>>> Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> (qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
>>>
>>> -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
>>> -QEMU X.Y.Z monitor - type 'help' for more information
>>> -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
>>> -quit
>>> -
>>> Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> (qemu) quit
>>
>> Ack for that part.
>>
>>> diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out
>>> index c8377fe146..d83bba1a88 100644
>>> --- a/tests/qemu-iotests/186.out
>>> +++ b/tests/qemu-iotests/186.out
>>> @@ -444,31 +444,15 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
>>>
>>> Testing: -drive if=scsi,driver=null-co
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type
>>> -info block
>>> -scsi0-hd0 (NODE_NAME): null-co:// (null-co)
>>> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
>>> - Cache mode: writeback
>>> -(qemu) quit
>>> +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: machine type does not support if=scsi,bus=0,unit=0
>>>
>>> Testing: -drive if=scsi,media=cdrom
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
>>> -info block
>>> -scsi0-cd0: [not inserted]
>>> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
>>> - Removable device: not locked, tray closed
>>> -(qemu) quit
>>> +(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
>>>
>>> Testing: -drive if=scsi,driver=null-co,media=cdrom
>>> QEMU X.Y.Z monitor - type 'help' for more information
>>> -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
>>> -info block
>>> -scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
>>> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
>>> - Removable device: not locked, tray closed
>>> - Cache mode: writeback
>>> -(qemu) quit
>>> +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
>>
>> That rather sounds like this "if=scsi" test should be removed now?
>
> I think, it actually sounds like a SCSI adapter should be added manually
> now.
The "-drive if=scsi" syntax was deprecated for x86 and has now been
completely removed. It also does not work there anymore if you configure
a SCSI adapter manually first. For SCSI device, you now have to use
"-device scsi-hd" etc. on x86 instead.
Thomas
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] iotests: Update output of 051 and 186 after commit 1454509726719e0933c
2018-03-13 16:22 ` Thomas Huth
@ 2018-03-13 16:37 ` Kevin Wolf
0 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2018-03-13 16:37 UTC (permalink / raw)
To: Thomas Huth
Cc: Alberto Garcia, qemu-devel, Paolo Bonzini, Markus Armbruster,
Qemu-block
Am 13.03.2018 um 17:22 hat Thomas Huth geschrieben:
> On 13.03.2018 17:08, Kevin Wolf wrote:
> > Am 06.03.2018 um 17:52 hat Thomas Huth geschrieben:
> >> On 06.03.2018 17:45, Alberto Garcia wrote:
> >>> Signed-off-by: Alberto Garcia <berto@igalia.com>
> >>> ---
> >>> tests/qemu-iotests/051.pc.out | 20 --------------------
> >>> tests/qemu-iotests/186.out | 22 +++-------------------
> >>> 2 files changed, 3 insertions(+), 39 deletions(-)
> >>>
> >>> diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
> >>> index 830c11880a..b01f9a90d7 100644
> >>> --- a/tests/qemu-iotests/051.pc.out
> >>> +++ b/tests/qemu-iotests/051.pc.out
> >>> @@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> (qemu) quit
> >>>
> >>> -Testing: -drive if=scsi,media=cdrom
> >>> -QEMU X.Y.Z monitor - type 'help' for more information
> >>> -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> >>> -quit
> >>> -
> >>> Testing: -drive if=ide
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> (qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
> >>>
> >>> -Testing: -drive if=scsi
> >>> -QEMU X.Y.Z monitor - type 'help' for more information
> >>> -(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with this machine type
> >>> -QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
> >>> -
> >>> Testing: -drive if=virtio
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
> >>> @@ -170,20 +160,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> (qemu) quit
> >>>
> >>> -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on
> >>> -QEMU X.Y.Z monitor - type 'help' for more information
> >>> -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
> >>> -quit
> >>> -
> >>> Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> (qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
> >>>
> >>> -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
> >>> -QEMU X.Y.Z monitor - type 'help' for more information
> >>> -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type
> >>> -quit
> >>> -
> >>> Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> (qemu) quit
> >>
> >> Ack for that part.
> >>
> >>> diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out
> >>> index c8377fe146..d83bba1a88 100644
> >>> --- a/tests/qemu-iotests/186.out
> >>> +++ b/tests/qemu-iotests/186.out
> >>> @@ -444,31 +444,15 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
> >>>
> >>> Testing: -drive if=scsi,driver=null-co
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type
> >>> -info block
> >>> -scsi0-hd0 (NODE_NAME): null-co:// (null-co)
> >>> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> >>> - Cache mode: writeback
> >>> -(qemu) quit
> >>> +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: machine type does not support if=scsi,bus=0,unit=0
> >>>
> >>> Testing: -drive if=scsi,media=cdrom
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> >>> -info block
> >>> -scsi0-cd0: [not inserted]
> >>> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> >>> - Removable device: not locked, tray closed
> >>> -(qemu) quit
> >>> +(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
> >>>
> >>> Testing: -drive if=scsi,driver=null-co,media=cdrom
> >>> QEMU X.Y.Z monitor - type 'help' for more information
> >>> -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
> >>> -info block
> >>> -scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
> >>> - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
> >>> - Removable device: not locked, tray closed
> >>> - Cache mode: writeback
> >>> -(qemu) quit
> >>> +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: machine type does not support if=scsi,bus=0,unit=0
> >>
> >> That rather sounds like this "if=scsi" test should be removed now?
> >
> > I think, it actually sounds like a SCSI adapter should be added manually
> > now.
>
> The "-drive if=scsi" syntax was deprecated for x86 and has now been
> completely removed. It also does not work there anymore if you configure
> a SCSI adapter manually first. For SCSI device, you now have to use
> "-device scsi-hd" etc. on x86 instead.
I see. Yes, the part with -evice scsi-hd is already covered in another
part of the test case, so removing it should be fine.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-13 16:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-06 16:45 [Qemu-devel] [PATCH] iotests: Update output of 051 and 186 after commit 1454509726719e0933c Alberto Garcia
2018-03-06 16:52 ` Thomas Huth
2018-03-13 16:08 ` Kevin Wolf
2018-03-13 16:22 ` Thomas Huth
2018-03-13 16:37 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).