From 85f6b66c2b1e6804195a44a53142de78afb46233 Mon Sep 17 00:00:00 2001
From: Bogdan Marcynkov <bmarcynk@redhat.com>
Date: Mon, 4 Nov 2024 13:03:59 +0100
Subject: [PATCH] RNG: guest report driver updates for RHEL.7,RHEL.8

Updates for s390x platform

Signed-off-by: Bogdan Marcynkov <bmarcynk@redhat.com>
---
 qemu/tests/cfg/rng_bat.cfg             | 2 +-
 qemu/tests/cfg/rng_host_guest_read.cfg | 2 +-
 qemu/tests/cfg/rng_hotplug.cfg         | 2 +-
 qemu/tests/cfg/rng_maxbytes_period.cfg | 2 +-
 qemu/tests/cfg/rng_read_longtime.cfg   | 4 ++--
 qemu/tests/cfg/rng_stress.cfg          | 2 +-
 qemu/tests/cfg/viorng_in_use.cfg       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/qemu/tests/cfg/rng_bat.cfg b/qemu/tests/cfg/rng_bat.cfg
index 5ee849a2bf..81aa4a9008 100644
--- a/qemu/tests/cfg/rng_bat.cfg
+++ b/qemu/tests/cfg/rng_bat.cfg
@@ -33,7 +33,7 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - @default:
diff --git a/qemu/tests/cfg/rng_host_guest_read.cfg b/qemu/tests/cfg/rng_host_guest_read.cfg
index affd555481..c63b6b5ff7 100644
--- a/qemu/tests/cfg/rng_host_guest_read.cfg
+++ b/qemu/tests/cfg/rng_host_guest_read.cfg
@@ -34,5 +34,5 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
diff --git a/qemu/tests/cfg/rng_hotplug.cfg b/qemu/tests/cfg/rng_hotplug.cfg
index 70fab14227..37416134da 100644
--- a/qemu/tests/cfg/rng_hotplug.cfg
+++ b/qemu/tests/cfg/rng_hotplug.cfg
@@ -47,7 +47,7 @@
             start_rngd_service = "service rngd start"
         s390x:
             rng_driver = "virtio-rng-ccw"
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - multi_rngs:
diff --git a/qemu/tests/cfg/rng_maxbytes_period.cfg b/qemu/tests/cfg/rng_maxbytes_period.cfg
index e6f104fe0e..2eff64bb7d 100644
--- a/qemu/tests/cfg/rng_maxbytes_period.cfg
+++ b/qemu/tests/cfg/rng_maxbytes_period.cfg
@@ -12,7 +12,7 @@
         check_rngd_service = "service rngd status"
         start_rngd_service = "service rngd start"
     s390x:
-        RHEL.9:
+        !RHEL.7,RHEL.8:
             update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - positive_test:
diff --git a/qemu/tests/cfg/rng_read_longtime.cfg b/qemu/tests/cfg/rng_read_longtime.cfg
index 8efdabe2a4..8128b2172c 100644
--- a/qemu/tests/cfg/rng_read_longtime.cfg
+++ b/qemu/tests/cfg/rng_read_longtime.cfg
@@ -10,7 +10,7 @@
         #rng_dll_register_cmd = if not exist "C:\Windows\system32\viorngum.dll" copy PATH:\INCLUDEDRIVER\viorngum.dll C:\Windows\system32\ /y &&"
         session_cmd_timeout = 240
         rng_dst = "c:\random_%PROCESSOR_ARCHITECTURE%.exe"
-        read_rng_cmd = for /l %i in (1, 1, 1000) do ${rng_dst} 
+        read_rng_cmd = for /l %i in (1, 1, 1000) do ${rng_dst}
         driver_name = "viorng"
         rng_data_rex = "0x\w"
         driver_id_pattern = "(.*?):.*?VirtIO RNG Device"
@@ -39,5 +39,5 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
diff --git a/qemu/tests/cfg/rng_stress.cfg b/qemu/tests/cfg/rng_stress.cfg
index 33f180133a..d2ee0feb11 100644
--- a/qemu/tests/cfg/rng_stress.cfg
+++ b/qemu/tests/cfg/rng_stress.cfg
@@ -35,7 +35,7 @@
             start_rngd_service = "service rngd start"
         s390x:
             rng_driver = "virtio-rng-ccw"
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - two_device:
diff --git a/qemu/tests/cfg/viorng_in_use.cfg b/qemu/tests/cfg/viorng_in_use.cfg
index dae6cb8aa7..bc080c1f05 100644
--- a/qemu/tests/cfg/viorng_in_use.cfg
+++ b/qemu/tests/cfg/viorng_in_use.cfg
@@ -43,7 +43,7 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - before_bg_test: