* [Qemu-devel] [PATCH for-2.12 v3 0/2] Update output of some iotests @ 2018-03-22 11:14 Alberto Garcia 2018-03-22 11:14 ` [Qemu-devel] [PATCH for-2.12 v3 1/2] iotests: Update 051 and 186 after commit 1454509726719e0933c Alberto Garcia 2018-03-22 11:14 ` [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 Alberto Garcia 0 siblings, 2 replies; 6+ messages in thread From: Alberto Garcia @ 2018-03-22 11:14 UTC (permalink / raw) To: qemu-devel; +Cc: Alberto Garcia Hi, I sent a patch a few days ago correction the output of iotests 051 and 186. I wanted to resend it again but I noticed that 186 needs now more changes due to commit ac64273c66ab136c44043259162, so I'm including those changes too. Regards, Berto Alberto Garcia (2): iotests: Update 051 and 186 after commit 1454509726719e0933c iotests: Update 186 after commit ac64273c66ab136c44043259162 tests/qemu-iotests/051.pc.out | 20 -------------------- tests/qemu-iotests/186 | 4 ---- tests/qemu-iotests/186.out | 32 ++------------------------------ 3 files changed, 2 insertions(+), 54 deletions(-) -- 2.11.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH for-2.12 v3 1/2] iotests: Update 051 and 186 after commit 1454509726719e0933c 2018-03-22 11:14 [Qemu-devel] [PATCH for-2.12 v3 0/2] Update output of some iotests Alberto Garcia @ 2018-03-22 11:14 ` Alberto Garcia 2018-03-22 11:14 ` [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 Alberto Garcia 1 sibling, 0 replies; 6+ messages in thread From: Alberto Garcia @ 2018-03-22 11:14 UTC (permalink / raw) To: qemu-devel; +Cc: Alberto Garcia, Thomas Huth SCSI controllers are no longer created automatically for -drive if=scsi, so this patch updates the tests that relied on that. Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Eric Blake <eblake@redhat.com> Cc: Thomas Huth <thuth@redhat.com> --- tests/qemu-iotests/051.pc.out | 20 -------------------- tests/qemu-iotests/186 | 4 ---- tests/qemu-iotests/186.out | 28 ---------------------------- 3 files changed, 52 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 b/tests/qemu-iotests/186 index 44cc01ed87..9687243d34 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -133,10 +133,6 @@ check_info_block -drive if=ide,driver=null-co check_info_block -drive if=ide,media=cdrom check_info_block -drive if=ide,driver=null-co,media=cdrom -check_info_block -drive if=scsi,driver=null-co -check_info_block -drive if=scsi,media=cdrom -check_info_block -drive if=scsi,driver=null-co,media=cdrom - check_info_block -drive if=virtio,driver=null-co check_info_block -drive if=pflash,driver=null-co,size=1M diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index c8377fe146..ec75c0fc60 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -442,34 +442,6 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) Cache mode: writeback (qemu) quit -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 - -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 - -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 - Testing: -drive if=virtio,driver=null-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block -- 2.11.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 2018-03-22 11:14 [Qemu-devel] [PATCH for-2.12 v3 0/2] Update output of some iotests Alberto Garcia 2018-03-22 11:14 ` [Qemu-devel] [PATCH for-2.12 v3 1/2] iotests: Update 051 and 186 after commit 1454509726719e0933c Alberto Garcia @ 2018-03-22 11:14 ` Alberto Garcia 2018-03-22 13:17 ` Eric Blake 1 sibling, 1 reply; 6+ messages in thread From: Alberto Garcia @ 2018-03-22 11:14 UTC (permalink / raw) To: qemu-devel; +Cc: Alberto Garcia, Philippe Mathieu-Daudé Signed-off-by: Alberto Garcia <berto@igalia.com> Cc: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/qemu-iotests/186.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index ec75c0fc60..5020162826 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -404,7 +404,7 @@ Testing: -drive if=floppy QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block floppy0: [not inserted] - Attached to: /machine/unattached/device[17] + Attached to: /machine/unattached/device[13] Removable device: not locked, tray closed (qemu) quit @@ -412,7 +412,7 @@ Testing: -drive if=floppy,driver=null-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block floppy0 (NODE_NAME): null-co:// (null-co) - Attached to: /machine/unattached/device[17] + Attached to: /machine/unattached/device[13] Removable device: not locked, tray closed Cache mode: writeback (qemu) quit -- 2.11.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 2018-03-22 11:14 ` [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 Alberto Garcia @ 2018-03-22 13:17 ` Eric Blake 2018-03-22 13:42 ` Alberto Garcia 0 siblings, 1 reply; 6+ messages in thread From: Eric Blake @ 2018-03-22 13:17 UTC (permalink / raw) To: Alberto Garcia, qemu-devel; +Cc: Philippe Mathieu-Daudé On 03/22/2018 06:14 AM, Alberto Garcia wrote: > Signed-off-by: Alberto Garcia <berto@igalia.com> > Cc: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/qemu-iotests/186.out | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out > index ec75c0fc60..5020162826 100644 > --- a/tests/qemu-iotests/186.out > +++ b/tests/qemu-iotests/186.out > @@ -404,7 +404,7 @@ Testing: -drive if=floppy > QEMU X.Y.Z monitor - type 'help' for more information > (qemu) info block > floppy0: [not inserted] > - Attached to: /machine/unattached/device[17] > + Attached to: /machine/unattached/device[13] It looks like this name is quite flexible; would it not be better to enhance 186 to sed out the name (s/Attached to:.*/Attached to: PATH/) and then adjust the .out so that it is no longer sensitive to these types of internal renames? -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 2018-03-22 13:17 ` Eric Blake @ 2018-03-22 13:42 ` Alberto Garcia 2018-03-22 13:55 ` Eric Blake 0 siblings, 1 reply; 6+ messages in thread From: Alberto Garcia @ 2018-03-22 13:42 UTC (permalink / raw) To: Eric Blake, qemu-devel; +Cc: Philippe Mathieu-Daudé On Thu 22 Mar 2018 02:17:23 PM CET, Eric Blake wrote: >> --- a/tests/qemu-iotests/186.out >> +++ b/tests/qemu-iotests/186.out >> @@ -404,7 +404,7 @@ Testing: -drive if=floppy >> QEMU X.Y.Z monitor - type 'help' for more information >> (qemu) info block >> floppy0: [not inserted] >> - Attached to: /machine/unattached/device[17] >> + Attached to: /machine/unattached/device[13] > > It looks like this name is quite flexible; would it not be better to > enhance 186 to sed out the name (s/Attached to:.*/Attached to: PATH/) > and then adjust the .out so that it is no longer sensitive to these > types of internal renames? That's a good idea, shall we hide the number only? (i.e. leave "/machine/unattached/device[INDEX]" or something like that), or can the rest of the path also change? Berto ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 2018-03-22 13:42 ` Alberto Garcia @ 2018-03-22 13:55 ` Eric Blake 0 siblings, 0 replies; 6+ messages in thread From: Eric Blake @ 2018-03-22 13:55 UTC (permalink / raw) To: Alberto Garcia, qemu-devel; +Cc: Philippe Mathieu-Daudé On 03/22/2018 08:42 AM, Alberto Garcia wrote: > On Thu 22 Mar 2018 02:17:23 PM CET, Eric Blake wrote: >>> --- a/tests/qemu-iotests/186.out >>> +++ b/tests/qemu-iotests/186.out >>> @@ -404,7 +404,7 @@ Testing: -drive if=floppy >>> QEMU X.Y.Z monitor - type 'help' for more information >>> (qemu) info block >>> floppy0: [not inserted] >>> - Attached to: /machine/unattached/device[17] >>> + Attached to: /machine/unattached/device[13] >> >> It looks like this name is quite flexible; would it not be better to >> enhance 186 to sed out the name (s/Attached to:.*/Attached to: PATH/) >> and then adjust the .out so that it is no longer sensitive to these >> types of internal renames? > > That's a good idea, shall we hide the number only? (i.e. leave > "/machine/unattached/device[INDEX]" or something like that), or can the > rest of the path also change? I don't see the value in knowing whether the device is unattached, or if a future attaches it somewhere, so changing the entire thing to PATH seems reasonable, rather than trying to just focus on the index. (That is, the sed expression I mentioned is sufficient) -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-03-22 13:55 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-03-22 11:14 [Qemu-devel] [PATCH for-2.12 v3 0/2] Update output of some iotests Alberto Garcia 2018-03-22 11:14 ` [Qemu-devel] [PATCH for-2.12 v3 1/2] iotests: Update 051 and 186 after commit 1454509726719e0933c Alberto Garcia 2018-03-22 11:14 ` [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 Alberto Garcia 2018-03-22 13:17 ` Eric Blake 2018-03-22 13:42 ` Alberto Garcia 2018-03-22 13:55 ` Eric Blake
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).