[Qemu-devel] [PATCH v2 0/2] qemu-iotests: fix 140 on s390x

[Qemu-devel] [PATCH v2 0/2] qemu-iotests: fix 140 on s390x

[Sascha Silbe]

Yet another IDE-using test crept in (commit 16dee418). Fix it by
disabling the implicit drive.

v1->v2:
- don't use any drive at all instead of replacing IDE with virtio-scsi
- split off virtio alias patch into separate series (no longer needed
  in this one)
- add patch to improve description of qemu-iotest 140


Sascha Silbe (2):
  qemu-iotests: 140: don't use IDE drive
  qemu-iotests: 140: make description slightly more verbose

 tests/qemu-iotests/140     | 8 ++++++--
 tests/qemu-iotests/140.out | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.1.4

[Qemu-devel] [PATCH v2 1/2] qemu-iotests: 140: don't use IDE device

[Sascha Silbe]

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>
---
v1->v2:
  - don't use any drive at all instead of replacing IDE with virtio-scsi

 tests/qemu-iotests/140     | 2 +-
 tests/qemu-iotests/140.out | 1 -
 2 files changed, 1 insertion(+), 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'
-- 
2.1.4

[Qemu-devel] [PATCH v2 2/2] qemu-iotests: 140: make description slightly more verbose

[Sascha Silbe]

Describe in a little more detail what the test is supposed to achieve.

Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
---
Max, does this reflect your intentions well enough? I took the liberty
of re-using some of your review comments to extend the description.

v1->v2: new patch

 tests/qemu-iotests/140 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index baaf64e..05e4506 100755
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140
@@ -1,6 +1,10 @@
 #!/bin/bash
 #
-# Test case for ejecting a BB with an NBD server attached to it
+# Test case for ejecting a BlockBackend with an NBD server attached to it
+#
+# Verify that the NBD server stops offering the drive when ejecting a
+# BlockDriverState tree from a BlockBackend (that is, a medium from a
+# drive) exposed via an NBD server.
 #
 # Copyright (C) 2016 Red Hat, Inc.
 #
-- 
2.1.4

Re: [Qemu-devel] [PATCH v2 2/2] qemu-iotests: 140: make description slightly more verbose

[Max Reitz]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

On 18.02.2016 21:37, Sascha Silbe wrote:
> Describe in a little more detail what the test is supposed to achieve.
> 
> Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
> ---
> Max, does this reflect your intentions well enough? I took the liberty
> of re-using some of your review comments to extend the description.

Yes, it's fine, thanks.

Max


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: fix 140 on s390x

[Max Reitz]

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

On 18.02.2016 21:37, Sascha Silbe wrote:
> Yet another IDE-using test crept in (commit 16dee418). Fix it by
> disabling the implicit drive.
> 
> v1->v2:
> - don't use any drive at all instead of replacing IDE with virtio-scsi
> - split off virtio alias patch into separate series (no longer needed
>   in this one)
> - add patch to improve description of qemu-iotest 140
> 
> 
> Sascha Silbe (2):
>   qemu-iotests: 140: don't use IDE drive
>   qemu-iotests: 140: make description slightly more verbose
> 
>  tests/qemu-iotests/140     | 8 ++++++--
>  tests/qemu-iotests/140.out | 1 -
>  2 files changed, 6 insertions(+), 3 deletions(-)

Thanks, applied to my block tree:

https://github.com/XanClic/qemu/commits/block

Max


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]