diff options
| author | Sascha Silbe <silbe@linux.vnet.ibm.com> | 2016-02-18 21:37:32 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-02-22 16:54:14 +0100 |
| commit | 4b84fc70cecd616ccc61b563def2230d73b438b8 (patch) | |
| tree | 9dd7583457b3425fe1f165e79b8b564d72d82834 | |
| parent | f436c94102274f14b556beb655da8a54400e56f3 (diff) | |
| download | qemu-4b84fc70cecd616ccc61b563def2230d73b438b8.zip qemu-4b84fc70cecd616ccc61b563def2230d73b438b8.tar.gz qemu-4b84fc70cecd616ccc61b563def2230d73b438b8.tar.bz2 | |
qemu-iotests: 140: don't use IDE device
IDE is only implemented by very few architectures (mostly PC). The
test doesn't actually need a block device attached to the
BlockBackend, so just drop it and adjust the reference output
accordingly.
Fixes: 16dee418 ("iotests: Add test for eject under NBD server")
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Message-id: 1455827853-33477-2-git-send-email-silbe@linux.vnet.ibm.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/140 | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/140.out | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index f78c317..baaf64e 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -49,7 +49,7 @@ _make_test_img 64k $QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io keep_stderr=y \ -_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ +_launch_qemu -drive if=none,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ 2> >(_filter_nbd) _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out index 72f1b4c..0409cd0 100644 --- a/tests/qemu-iotests/140.out +++ b/tests/qemu-iotests/140.out @@ -7,7 +7,6 @@ wrote 65536/65536 bytes at offset 0 {"return": {}} read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "drv", "tray-open": true}} {"return": {}} can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: No export with name 'drv' available no file open, try 'help open' |