qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>, Cornelia Huck <cohuck@redhat.com>,
	qemu-devel@nongnu.org,
	Wainer dos Santos Moschetta <wainersm@redhat.com>,
	Willian Rampazzo <willianr@redhat.com>,
	qemu-s390x@nongnu.org
Subject: [PULL 10/14] tests/acceptance: Test virtio-rng on s390 via /dev/hwrng
Date: Tue, 22 Dec 2020 11:44:59 +0100	[thread overview]
Message-ID: <20201222104503.224510-11-cohuck@redhat.com> (raw)
In-Reply-To: <20201222104503.224510-1-cohuck@redhat.com>

From: Thomas Huth <thuth@redhat.com>

/dev/hwrng is only functional if virtio-rng is working right, so let's
add a sanity check for this device node.

Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Tested-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201215183623.110128-3-thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 tests/acceptance/machine_s390_ccw_virtio.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
index 3d146b9ce640..e1ad0e29b0cd 100644
--- a/tests/acceptance/machine_s390_ccw_virtio.py
+++ b/tests/acceptance/machine_s390_ccw_virtio.py
@@ -64,9 +64,9 @@ class S390CCWVirtioMachine(Test):
                          '-append', kernel_command_line,
                          '-device', 'virtio-net-ccw,devno=fe.1.1111',
                          '-device',
-                         'virtio-rng-ccw,devno=fe.2.0000,max_revision=0',
+                         'virtio-rng-ccw,devno=fe.2.0000,max_revision=0,id=rn1',
                          '-device',
-                         'virtio-rng-ccw,devno=fe.3.1234,max_revision=2',
+                         'virtio-rng-ccw,devno=fe.3.1234,max_revision=2,id=rn2',
                          '-device', 'zpci,uid=5,target=zzz',
                          '-device', 'virtio-net-pci,id=zzz',
                          '-device', 'zpci,uid=0xa,fid=12,target=serial',
@@ -96,6 +96,19 @@ class S390CCWVirtioMachine(Test):
         exec_command_and_wait_for_pattern(self,
                         'cat /sys/bus/ccw/devices/0.3.1234/virtio?/features',
                         virtio_rng_features)
+        # check that /dev/hwrng works - and that it's gone after ejecting
+        exec_command_and_wait_for_pattern(self,
+                        'dd if=/dev/hwrng of=/dev/null bs=1k count=10',
+                        '10+0 records out')
+        self.clear_guest_dmesg()
+        self.vm.command('device_del', id='rn1')
+        self.wait_for_crw_reports()
+        self.clear_guest_dmesg()
+        self.vm.command('device_del', id='rn2')
+        self.wait_for_crw_reports()
+        exec_command_and_wait_for_pattern(self,
+                        'dd if=/dev/hwrng of=/dev/null bs=1k count=10',
+                        'dd: /dev/hwrng: No such device')
         # verify that we indeed have virtio-net devices (without having the
         # virtio-net driver handy)
         exec_command_and_wait_for_pattern(self,
-- 
2.26.2



  parent reply	other threads:[~2020-12-22 10:52 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-22 10:44 [PULL 00/14] s390x update Cornelia Huck
2020-12-22 10:44 ` [PULL 01/14] s390x: pv: Fence additional unavailable SCLP facilities for PV guests Cornelia Huck
2020-12-22 10:44 ` [PULL 02/14] MAINTAINERS: move my git tree to gitlab Cornelia Huck
2020-12-22 10:44 ` [PULL 03/14] qga/commands-posix: Send CCW address on s390x with the fsinfo data Cornelia Huck
2020-12-22 10:44 ` [PULL 04/14] target/s390x: Improve cc computation for ADD LOGICAL Cornelia Huck
2020-12-22 10:44 ` [PULL 05/14] target/s390x: Improve ADD LOGICAL WITH CARRY Cornelia Huck
2020-12-22 10:44 ` [PULL 06/14] target/s390x: Improve cc computation for SUBTRACT LOGICAL Cornelia Huck
2020-12-22 10:44 ` [PULL 07/14] target/s390x: Improve SUB LOGICAL WITH BORROW Cornelia Huck
2020-12-22 10:44 ` [PULL 08/14] tests/acceptance: test hot(un)plug of ccw devices Cornelia Huck
2020-12-22 10:44 ` [PULL 09/14] tests/acceptance: Extract the code to clear dmesg and wait for CRW reports Cornelia Huck
2020-12-22 10:44 ` Cornelia Huck [this message]
2020-12-22 10:45 ` [PULL 11/14] tests/acceptance: Test the virtio-balloon device on s390x Cornelia Huck
2020-12-22 10:45 ` [PULL 12/14] s390x/pci: fix pcistb length Cornelia Huck
2020-12-22 10:45 ` [PULL 13/14] s390x/pci: Fix memory_region_access_valid call Cornelia Huck
2020-12-22 10:45 ` [PULL 14/14] tests/acceptance: Add a test with the Fedora 31 kernel and initrd Cornelia Huck
2021-01-01 19:57 ` [PULL 00/14] s390x update Peter Maydell

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=20201222104503.224510-11-cohuck@redhat.com \
    --to=cohuck@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=willianr@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).