mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: Update 186 after commit ac64273c66

Browse Source 
Commit ac64273c66 modified the output of iotest 186, changing
the QOM path of floppy drives from /machine/unattached/device[17] to
/machine/unattached/device[13].

Instead of updating the test output to reflect this change, this patch
adds a new filter that hides all QOM paths from the 'Attached to:'
line of the 'info block' command.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Alberto Garcia 2018-03-22 16:45:51 +02:00 committed by Kevin Wolf
parent 242c172132
commit 627f607e3d
3 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemu-iotests/186
View File

@ -64,7 +64,7 @@ function check_info_block()
{ {
echo "info block" | echo "info block" |
do_run_qemu "$@" | _filter_win32 | _filter_hmp | _filter_qemu | do_run_qemu "$@" | _filter_win32 | _filter_hmp | _filter_qemu |
_filter_generated_node_ids _filter_generated_node_ids | _filter_qom_path
} }

56
tests/qemu-iotests/186.out
View File

@ -7,7 +7,7 @@ Testing: -device floppy
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
/machine/peripheral-anon/device[1]: [not inserted] /machine/peripheral-anon/device[1]: [not inserted]
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -23,7 +23,7 @@ Testing: -device ide-cd
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
/machine/peripheral-anon/device[1]: [not inserted] /machine/peripheral-anon/device[1]: [not inserted]
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -39,7 +39,7 @@ Testing: -device scsi-cd
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
/machine/peripheral-anon/device[1]: [not inserted] /machine/peripheral-anon/device[1]: [not inserted]
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -58,7 +58,7 @@ Testing: -blockdev driver=null-co,node-name=null -device ide-hd,drive=null
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -74,7 +74,7 @@ Testing: -blockdev driver=null-co,node-name=null -device scsi-hd,drive=null
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -90,7 +90,7 @@ Testing: -blockdev driver=null-co,node-name=null -device virtio-blk-pci,drive=nu
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1]/virtio-backend Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -98,7 +98,7 @@ Testing: -blockdev driver=null-co,node-name=null -device virtio-blk-pci,drive=nu
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral/qdev_id/virtio-backend Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -106,7 +106,7 @@ Testing: -blockdev driver=null-co,node-name=null -device floppy,drive=null
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -124,7 +124,7 @@ Testing: -blockdev driver=null-co,node-name=null -device ide-cd,drive=null
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -142,7 +142,7 @@ Testing: -blockdev driver=null-co,node-name=null -device scsi-cd,drive=null
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -191,7 +191,7 @@ none0 (null): null-co:// (null-co)
Cache mode: writeback Cache mode: writeback
null: null-co:// (null-co) null: null-co:// (null-co)
Attached to: /machine/peripheral/qdev_id/virtio-backend Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -241,7 +241,7 @@ Testing: -drive if=none,driver=null-co,node-name=null -device ide-hd,drive=none0
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0 (null): null-co:// (null-co) none0 (null): null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -257,7 +257,7 @@ Testing: -drive if=none,driver=null-co,node-name=null -device scsi-hd,drive=none
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0 (null): null-co:// (null-co) none0 (null): null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -273,7 +273,7 @@ Testing: -drive if=none,driver=null-co,node-name=null -device virtio-blk-pci,dri
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0 (null): null-co:// (null-co) none0 (null): null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1]/virtio-backend Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -281,7 +281,7 @@ Testing: -drive if=none,driver=null-co,node-name=null -device virtio-blk-pci,dri
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0 (null): null-co:// (null-co) none0 (null): null-co:// (null-co)
Attached to: /machine/peripheral/qdev_id/virtio-backend Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -289,7 +289,7 @@ Testing: -drive if=none,driver=null-co,node-name=null -device floppy,drive=none0
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0 (null): null-co:// (null-co) none0 (null): null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -307,7 +307,7 @@ Testing: -drive if=none,driver=null-co,node-name=null -device ide-cd,drive=none0
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0 (null): null-co:// (null-co) none0 (null): null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -325,7 +325,7 @@ Testing: -drive if=none,driver=null-co,node-name=null -device scsi-cd,drive=none
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0 (null): null-co:// (null-co) none0 (null): null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -353,7 +353,7 @@ Testing: -drive if=none -device floppy,drive=none0
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0: [not inserted] none0: [not inserted]
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -369,7 +369,7 @@ Testing: -drive if=none -device ide-cd,drive=none0
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0: [not inserted] none0: [not inserted]
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -385,7 +385,7 @@ Testing: -drive if=none -device scsi-cd,drive=none0
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
none0: [not inserted] none0: [not inserted]
Attached to: /machine/peripheral-anon/device[1] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -404,7 +404,7 @@ Testing: -drive if=floppy
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
floppy0: [not inserted] floppy0: [not inserted]
Attached to: /machine/unattached/device[17] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -412,7 +412,7 @@ Testing: -drive if=floppy,driver=null-co
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
floppy0 (NODE_NAME): null-co:// (null-co) floppy0 (NODE_NAME): null-co:// (null-co)
Attached to: /machine/unattached/device[17] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -421,7 +421,7 @@ Testing: -drive if=ide,driver=null-co
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
ide0-hd0 (NODE_NAME): null-co:// (null-co) ide0-hd0 (NODE_NAME): null-co:// (null-co)
Attached to: /machine/unattached/device[18] Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -429,7 +429,7 @@ Testing: -drive if=ide,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
ide0-cd0: [not inserted] ide0-cd0: [not inserted]
Attached to: /machine/unattached/device[18] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
(qemu) quit (qemu) quit
@ -437,7 +437,7 @@ Testing: -drive if=ide,driver=null-co,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
Attached to: /machine/unattached/device[18] Attached to: PATH
Removable device: not locked, tray closed Removable device: not locked, tray closed
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -446,7 +446,7 @@ Testing: -drive if=virtio,driver=null-co
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
virtio0 (NODE_NAME): null-co:// (null-co) virtio0 (NODE_NAME): null-co:// (null-co)
Attached to: /machine/peripheral-anon/device[1]/virtio-backend Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit
@ -454,7 +454,7 @@ Testing: -drive if=pflash,driver=null-co,size=1M
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block (qemu) info block
pflash0 (NODE_NAME): json:{"driver": "null-co", "size": "1M"} (null-co) pflash0 (NODE_NAME): json:{"driver": "null-co", "size": "1M"} (null-co)
Attached to: /machine/unattached/device[2] Attached to: PATH
Cache mode: writeback Cache mode: writeback
(qemu) quit (qemu) quit

5
tests/qemu-iotests/common.filter
View File

@ -32,6 +32,11 @@ _filter_generated_node_ids()
sed -re 's/\#block[0-9]{3,}/NODE_NAME/' sed -re 's/\#block[0-9]{3,}/NODE_NAME/'
} }
_filter_qom_path()
{
sed -e 's#\(Attached to: *\) /.*#\1 PATH#'
}
# replace occurrences of the actual TEST_DIR value with TEST_DIR # replace occurrences of the actual TEST_DIR value with TEST_DIR
_filter_testdir() _filter_testdir()
{ {