On Tue, Jul 25, 2017 at 05:56:44PM +0200, Max Reitz wrote: > 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 <mre...@redhat.com> > --- > tests/qemu-iotests/186 | 2 +- > tests/qemu-iotests/186.out | 12 ++++++------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 > index ab83ee4..2b9f618 100755 > --- a/tests/qemu-iotests/186 > +++ b/tests/qemu-iotests/186 > @@ -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 > } > > diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out > index b8bf9a2..c8377fe 100644 > --- a/tests/qemu-iotests/186.out > +++ b/tests/qemu-iotests/186.out > @@ -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 > -- > 2.9.4 > >
Reviewed-by: Jeff Cody <jc...@redhat.com>
