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

iotests: Redirect stderr to stdout in 186

Browse Source 
Without redirecting qemu's stderr to stdout, _filter_qemu will not apply
to warnings.  This results in $QEMU_PROG not being replaced by QEMU_PROG
which is not great if your qemu executable is not called
qemu-system-x86_64 (e.g. qemu-system-i386).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2017-07-25 17:56:44 +02:00 committed by Kevin Wolf
parent 645acdc0e6
commit c09bd34d82
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemu-iotests/186
View File

@ -56,7 +56,7 @@ function do_run_qemu()
done
fi
echo quit
) | $QEMU -S -nodefaults -display none -device virtio-scsi-pci -monitor stdio "$@"
) | $QEMU -S -nodefaults -display none -device virtio-scsi-pci -monitor stdio "$@" 2>&1
echo
}

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

@ -442,28 +442,28 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
Cache mode: writeback
(qemu) quit
qemu-system-x86_64: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type
Testing: -drive if=scsi,driver=null-co
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block
(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-system-x86_64: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
Testing: -drive if=scsi,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block
(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-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type
Testing: -drive if=scsi,driver=null-co,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) info block
(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