aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/240.out
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2019-04-26 19:29:47 +0200
committerKevin Wolf <kwolf@redhat.com>2019-06-04 15:22:22 +0200
commit4f71fb436a6fbec7a7b2360cdba741deeb24be67 (patch)
treeaf9c5c804a62cc93c2b5871d9467665fbcc5b1ef /tests/qemu-iotests/240.out
parent307a5f60ebe0506a5b90f323fdcabb4333405484 (diff)
scsi-disk: Use qdev_prop_drive_iothread
This makes use of qdev_prop_drive_iothread for scsi-disk so that the disk can be attached to a node that is already in the target AioContext. We need to check that the HBA actually supports iothreads, otherwise scsi-disk must make sure that the node is already in the main AioContext. This changes the error message for conflicting iothread settings. Previously, virtio-scsi produced the error message, now it comes from blk_set_aio_context(). Update a test case accordingly. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/240.out')
-rw-r--r--tests/qemu-iotests/240.out2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/240.out b/tests/qemu-iotests/240.out
index 84e0a43ce5..d00df50297 100644
--- a/tests/qemu-iotests/240.out
+++ b/tests/qemu-iotests/240.out
@@ -43,7 +43,7 @@ QMP_VERSION
{"return": {}}
{"return": {}}
{"return": {}}
-{"error": {"class": "GenericError", "desc": "Cannot attach a blockdev that is using a different iothread"}}
+{"error": {"class": "GenericError", "desc": "Cannot change iothread of active block backend"}}
{"return": {}}
{"return": {}}
{"return": {}}