Skip to content

Commit 179493f

Browse files
committed
tests/qtest/virtio-scsi: force QEMU restart for iothread-virtio-error
The qos framework reuses QEMU instances between tests with identical command lines, issuing system_reset instead of restarting. After iothread-attach-node, system_reset can deadlock in bdrv_graph_wrlock during drain on slow/contended CI runners. Force a fresh QEMU instance by adding seg_max_adjust=off to make the command line differ. Signed-off-by: Jason Truong <jason.truong@windriver.com>
1 parent e51a9f5 commit 179493f

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

tests/qtest/virtio-scsi-test.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,12 @@ static void register_virtio_scsi_test(void)
411411

412412
opts.before = virtio_scsi_setup_iothread;
413413
opts.edge = (QOSGraphEdgeOptions) {
414-
.extra_device_opts = "iothread=thread0",
414+
/*
415+
* Use seg_max_adjust=off to force a fresh QEMU instance.
416+
* Without this, the qos framework reuses the previous instance
417+
* with system_reset, which can deadlock in bdrv_graph_wrlock.
418+
*/
419+
.extra_device_opts = "iothread=thread0,seg_max_adjust=off",
415420
};
416421
qos_add_test("iothread-virtio-error", "virtio-scsi-pci",
417422
test_iothread_virtio_error, &opts);

0 commit comments

Comments
 (0)