From: Cornelia Huck <cohuck@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 1/3] tests/acceptance: test virtio-ccw revision handling
Date: Mon, 30 Nov 2020 19:02:14 +0100 [thread overview]
Message-ID: <20201130180216.15366-2-cohuck@redhat.com> (raw)
In-Reply-To: <20201130180216.15366-1-cohuck@redhat.com>
The max_revision prop of virtio-ccw devices can be used to force
an older revision for compatibility handling. The easiest way to
check this is to force a device to revision 0, which turns off
virtio-1.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
tests/acceptance/machine_s390_ccw_virtio.py | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
index db6352c44434..683b6e0dac2e 100644
--- a/tests/acceptance/machine_s390_ccw_virtio.py
+++ b/tests/acceptance/machine_s390_ccw_virtio.py
@@ -51,6 +51,10 @@ class S390CCWVirtioMachine(Test):
'-initrd', initrd_path,
'-append', kernel_command_line,
'-device', 'virtio-net-ccw,devno=fe.1.1111',
+ '-device',
+ 'virtio-rng-ccw,devno=fe.2.0000,max_revision=0',
+ '-device',
+ 'virtio-rng-ccw,devno=fe.3.1234,max_revision=2',
'-device', 'zpci,uid=5,target=zzz',
'-device', 'virtio-net-pci,id=zzz')
self.vm.launch()
@@ -60,9 +64,19 @@ class S390CCWVirtioMachine(Test):
# first debug shell is too early, we need to wait for device detection
exec_command_and_wait_for_pattern(self, 'exit', shell_ready)
- ccw_bus_id="0.1.1111"
+ ccw_bus_ids="0.1.1111 0.2.0000 0.3.1234"
pci_bus_id="0005:00:00.0"
exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/',
- ccw_bus_id)
+ ccw_bus_ids)
exec_command_and_wait_for_pattern(self, 'ls /sys/bus/pci/devices/',
pci_bus_id)
+ # check that the device at 0.2.0000 is in legacy mode, while the
+ # device at 0.3.1234 has the virtio-1 feature bit set
+ virtio_rng_features="0000000000000000000000000000110010000000000000000000000000000000"
+ virtio_rng_features_legacy="0000000000000000000000000000110000000000000000000000000000000000"
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/bus/ccw/devices/0.2.0000/virtio?/features',
+ virtio_rng_features_legacy)
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/bus/ccw/devices/0.3.1234/virtio?/features',
+ virtio_rng_features)
--
2.26.2
next prev parent reply other threads:[~2020-11-30 18:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 18:02 [PATCH 0/3] tests/acceptance: enhance s390x devices test Cornelia Huck
2020-11-30 18:02 ` Cornelia Huck [this message]
2020-12-01 10:43 ` [PATCH 1/3] tests/acceptance: test virtio-ccw revision handling Thomas Huth
2020-12-04 13:36 ` Wainer dos Santos Moschetta
2020-12-07 11:09 ` Cornelia Huck
2020-11-30 18:02 ` [PATCH 2/3] tests/acceptance: verify s390x device detection Cornelia Huck
2020-12-01 10:49 ` Thomas Huth
2020-12-04 13:47 ` Wainer dos Santos Moschetta
2020-12-07 11:10 ` Cornelia Huck
2020-11-30 18:02 ` [PATCH 3/3] tests/acceptance: test s390x zpci fid propagation Cornelia Huck
2020-12-01 10:52 ` Thomas Huth
2020-12-04 13:50 ` Wainer dos Santos Moschetta
2020-12-07 13:38 ` [PATCH 0/3] tests/acceptance: enhance s390x devices test Cornelia Huck
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=20201130180216.15366-2-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=crosa@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).