tests: qemu: Remove 's390-ccw' machine type from fake capabilities

Modern QEMUs don't support the machine type at all. Remove it from our fake caps generator too and adjust test cases which depend on it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-01-30 16:35:24 +00:00 · 2021-09-22 11:15:00 +02:00 · 2021-09-22 11:15:00 +02:00 · 102b84451a
commit 102b84451a
parent 266628906f
25 changed files with 25 additions and 25 deletions
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <features>
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>219136</currentMemory>
  <vcpu placement='static'>1</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <clock offset='utc'/>
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--- a/tests/qemuxml2argvdata/console-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.xml
@ -4,7 +4,7 @@
  <memory>219100</memory>
  <currentMemory>219100</currentMemory>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
  </os>
  <clock offset='utc'/>
  <on_poweroff>destroy</on_poweroff>
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>219100</currentMemory>
  <vcpu placement='static'>1</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <clock offset='utc'/>
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
@ -6,7 +6,7 @@
  <vcpu placement='static'>1</vcpu>
  <iothreads>2</iothreads>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <clock offset='utc'/>
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--- a/tests/qemuxml2argvdata/net-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.xml
@ -5,7 +5,7 @@
  <currentMemory>219136</currentMemory>
  <vcpu>1</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <clock offset='utc'/>
--- a/tests/qemuxml2argvdata/non-x86_64-timer-error.err
+++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.err
@ -1 +1 @@
-unsupported configuration: Configuring the 'tsc' timer is not supported for virtType=kvm arch=s390x machine=s390-ccw guests
+unsupported configuration: Configuring the 'tsc' timer is not supported for virtType=kvm arch=s390x machine=s390-ccw-virtio guests
--- a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml
+++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.xml
@ -4,7 +4,7 @@
  <memory>262144</memory>
  <currentMemory>262144</currentMemory>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
  </os>
  <clock offset='utc'>
    <timer name='tsc' present='yes'/>
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.xml
@ -4,7 +4,7 @@
  <memory>219100</memory>
  <currentMemory>219100</currentMemory>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
  </os>
  <clock offset='utc'/>
  <on_poweroff>destroy</on_poweroff>
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
@ -5,7 +5,7 @@
  <currentMemory unit='KiB'>219100</currentMemory>
  <vcpu placement='static'>1</vcpu>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <clock offset='utc'/>
--- a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
@ -6,7 +6,7 @@
  <vcpu placement='static'>1</vcpu>
  <iothreads>2</iothreads>
  <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
    <boot dev='hd'/>
  </os>
  <clock offset='utc'/>
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@ -73,7 +73,7 @@ static const char *const riscv64_machines[] = {
    "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL
 };
 static const char *const s390x_machines[] = {
-    "s390-ccw-virtio", "s390-ccw", NULL
+    "s390-ccw-virtio", NULL
 };
 static const char *const sparc_machines[] = {
    "SS-5", "LX", "SPARCClassic", "SPARCbook",