From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Cornelia Huck" <cohuck@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
qemu-s390x@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PATCH 4/4] iotests: iothreads need ioeventfd
Date: Thu, 18 Mar 2021 23:39:07 +0100 [thread overview]
Message-ID: <20210318223907.1344870-5-laurent@vivier.eu> (raw)
In-Reply-To: <20210318223907.1344870-1-laurent@vivier.eu>
And ioeventfd are only available with virtio-scsi-pci, so don't use the alias
and add a rule to require virtio-scsi-pci for the tests that use iothreads.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
tests/qemu-iotests/127 | 4 ++--
tests/qemu-iotests/256 | 2 ++
tests/qemu-iotests/iotests.py | 5 +++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
index 98e8e82a8210..a3693533685a 100755
--- a/tests/qemu-iotests/127
+++ b/tests/qemu-iotests/127
@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file fuse
-_require_devices virtio-scsi scsi-hd
+_require_devices virtio-scsi-pci scsi-hd
IMG_SIZE=64K
@@ -62,7 +62,7 @@ $QEMU_IO -c 'write 0 42' "$TEST_IMG.overlay0" | _filter_qemu_io
_launch_qemu \
-object iothread,id=iothr \
-blockdev node-name=source,driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG.overlay0" \
- -device virtio-scsi,id=scsi-bus,iothread=iothr \
+ -device virtio-scsi-pci,id=scsi-bus,iothread=iothr \
-device scsi-hd,bus=scsi-bus.0,drive=source
_send_qemu_cmd $QEMU_HANDLE \
diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256
index 8d82a1dd865f..eb3af0dea80c 100755
--- a/tests/qemu-iotests/256
+++ b/tests/qemu-iotests/256
@@ -24,6 +24,8 @@ import os
import iotests
from iotests import log
+iotests._verify_virtio_scsi_pci()
+
iotests.script_initialize(supported_fmts=['qcow2'])
size = 64 * 1024 * 1024
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 1e9e6a066e90..3404ed534bb5 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1146,6 +1146,11 @@ def _verify_virtio_blk() -> None:
if 'virtio-blk' not in out:
notrun('Missing virtio-blk in QEMU binary')
+def _verify_virtio_scsi_pci() -> None:
+ out = qemu_pipe('-M', 'none', '-device', 'help')
+ if 'virtio-scsi-pci' not in out:
+ notrun('Missing virtio-scsi-pci in QEMU binary')
+
def supports_quorum():
return 'quorum' in qemu_img_pipe('--help')
--
2.30.2
next prev parent reply other threads:[~2021-03-18 22:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 22:39 [PATCH 0/4] iotests: fix failures with non-PCI machines Laurent Vivier
2021-03-18 22:39 ` [PATCH 1/4] m68k: add the virtio devices aliases Laurent Vivier
2021-03-18 22:51 ` Philippe Mathieu-Daudé
2021-03-19 6:47 ` Thomas Huth
2021-03-19 11:36 ` Cornelia Huck
2021-03-19 12:07 ` Laurent Vivier
2021-03-18 22:39 ` [PATCH 2/4] iotests: Revert "iotests: use -ccw on s390x for 040, 139, and 182" Laurent Vivier
2021-03-19 10:39 ` Philippe Mathieu-Daudé
2021-03-19 11:43 ` Cornelia Huck
2021-03-19 12:09 ` Laurent Vivier
2021-03-18 22:39 ` [PATCH 3/4] iotests: test m68k with the virt machine Laurent Vivier
2021-03-18 22:46 ` Philippe Mathieu-Daudé
2021-03-18 22:39 ` Laurent Vivier [this message]
2021-03-19 11:06 ` [PATCH 4/4] iotests: iothreads need ioeventfd Paolo Bonzini
2021-03-19 11:27 ` Cornelia Huck
2021-03-19 11:28 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210318223907.1344870-5-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=cohuck@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.