[PATCH 03/11] iotests/051: Fix typo
The iothread isn't called 'iothread0', but 'thread0'. Depending on
the
order that properties are parsed, the error message may change from the
expected one to another one saying that the iothread doesn't exist.
Signed-off-by: Kevin Wolf <kwolf(a)redhat.com>
---
tests/qemu-iotests/051 | 2 +-
tests/qemu-iotests/051.pc.out | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 7bf29343d7..1d2fa93a11 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -199,7 +199,7 @@ case "$QEMU_DEFAULT_MACHINE" in
# virtio-blk enables the iothread only when the driver initialises the
# device, so a second virtio-blk device can't be added even with the
# same iothread. virtio-scsi allows this.
- run_qemu $iothread -device
virtio-blk-pci,drive=disk,iothread=iothread0,share-rw=on
+ run_qemu $iothread -device
virtio-blk-pci,drive=disk,iothread=thread0,share-rw=on
run_qemu $iothread -device virtio-scsi,id=virtio-scsi1,iothread=thread0 -device
scsi-hd,bus=virtio-scsi1.0,drive=disk,share-rw=on
;;
*)
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index afe7632964..063e4fc584 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -183,9 +183,9 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=none,node-name=disk -object
iothread,id
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) QEMU_PROG: -device scsi-hd,bus=virtio-scsi1.0,drive=disk,share-rw=on: Cannot
change iothread of active block backend
-Testing: -drive file=TEST_DIR/t.qcow2,if=none,node-name=disk -object iothread,id=thread0
-device virtio-scsi,iothread=thread0,id=virtio-scsi0 -device
scsi-hd,bus=virtio-scsi0.0,drive=disk,share-rw=on -device
virtio-blk-pci,drive=disk,iothread=iothread0,share-rw=on
+Testing: -drive file=TEST_DIR/t.qcow2,if=none,node-name=disk -object iothread,id=thread0
-device virtio-scsi,iothread=thread0,id=virtio-scsi0 -device
scsi-hd,bus=virtio-scsi0.0,drive=disk,share-rw=on -device
virtio-blk-pci,drive=disk,iothread=thread0,share-rw=on
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -device virtio-blk-pci,drive=disk,iothread=iothread0,share-rw=on:
Cannot change iothread of active block backend
+(qemu) QEMU_PROG: -device virtio-blk-pci,drive=disk,iothread=thread0,share-rw=on: Cannot
change iothread of active block backend
Testing: -drive file=TEST_DIR/t.qcow2,if=none,node-name=disk -object iothread,id=thread0
-device virtio-scsi,iothread=thread0,id=virtio-scsi0 -device
scsi-hd,bus=virtio-scsi0.0,drive=disk,share-rw=on -device
virtio-scsi,id=virtio-scsi1,iothread=thread0 -device
scsi-hd,bus=virtio-scsi1.0,drive=disk,share-rw=on
QEMU X.Y.Z monitor - type 'help' for more information
--
2.31.1