]> git.proxmox.com Git - mirror_qemu.git/commitdiff
tests/acceptance: verify s390x device detection
authorCornelia Huck <cohuck@redhat.com>
Mon, 30 Nov 2020 18:02:15 +0000 (19:02 +0100)
committerCornelia Huck <cohuck@redhat.com>
Fri, 11 Dec 2020 10:38:10 +0000 (11:38 +0100)
The kernel/initrd combination does not provide the virtio-net
driver; therefore, simply check whether the presented device type
is indeed virtio-net for the two virtio-net-{ccw,pci} devices.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
[re-formatted overlong lines]
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201130180216.15366-3-cohuck@redhat.com>

tests/acceptance/machine_s390_ccw_virtio.py

index c6812719728a54dc4aff565f83713608f1589210..ebea1b755c814677d42945bd3d9cc96b622e003c 100644 (file)
@@ -82,3 +82,14 @@ class S390CCWVirtioMachine(Test):
         exec_command_and_wait_for_pattern(self,
                         'cat /sys/bus/ccw/devices/0.3.1234/virtio?/features',
                         virtio_rng_features)
+        # verify that we indeed have virtio-net devices (without having the
+        # virtio-net driver handy)
+        exec_command_and_wait_for_pattern(self,
+                                    'cat /sys/bus/ccw/devices/0.1.1111/cutype',
+                                    '3832/01')
+        exec_command_and_wait_for_pattern(self,
+                    'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
+                    '0x1af4')
+        exec_command_and_wait_for_pattern(self,
+                    'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
+                    '0x0001')