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@xxxxxxxxxx>
---
.../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +-
...ug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 2 +-
...lug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 +-
.../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +-
...plug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +-
.../qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +-
.../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 2 +-
tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml | 2 +-
tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
tests/qemuxml2argvdata/balloon-ccw-deflate.xml | 2 +-
tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/console-virtio-ccw.xml | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.xml | 2 +-
tests/qemuxml2argvdata/non-x86_64-timer-error.err | 2 +-
tests/qemuxml2argvdata/non-x86_64-timer-error.xml | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.xml | 2 +-
tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml | 2 +-
tests/testutilsqemu.c | 2 +-
25 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
index 44f41c6ddd..a786d03185 100644
--- 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>
diff --git 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
index d10b29be7e..0c76410ff1 100644
--- 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>
diff --git 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
index 0988f8681c..e048d2c23a 100644
--- 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>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
index b0151cd690..fcf5bfadcb 100644
--- 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>
diff --git 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
index 0e8075caf6..8e7f479967 100644
--- 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>
diff --git 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
index 0e8075caf6..8e7f479967 100644
--- 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>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
index 240dda4c72..adec141512 100644
--- 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>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
index 9a650e340e..2267fe39df 100644
--- 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>
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 351ac7ea48..bf56265638 100644
--- 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 \
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.xml b/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
index fe7c76037f..046fd7137f 100644
--- 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'/>
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args
index 5af1839410..5447a5e9e0 100644
--- 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 \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.xml b/tests/qemuxml2argvdata/console-virtio-ccw.xml
index fc300db20e..5a16facbea 100644
--- 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>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 8f04e0b053..f78579846e 100644
--- 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 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
index 33234bc3d9..2ef7b0c688 100644
--- 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'/>
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 7d5efa5aa3..52af50f032 100644
--- 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 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
index dcc64ae618..dd2f6062c2 100644
--- 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'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 76ceaef6cf..24719f5a72 100644
--- 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 \
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.xml b/tests/qemuxml2argvdata/net-virtio-ccw.xml
index fa8d52d9c5..ef8f0c872b 100644
--- 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'/>
diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.err b/tests/qemuxml2argvdata/non-x86_64-timer-error.err
index f46673eb62..eab07d939d 100644
--- 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
diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml b/tests/qemuxml2argvdata/non-x86_64-timer-error.xml
index 11559bb52b..1c8bad2daf 100644
--- 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'/>
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index c728ead87e..8ec40a2a9e 100644
--- 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 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.xml b/tests/qemuxml2argvdata/virtio-rng-ccw.xml
index 2cf7d82b48..8aa7c509c3 100644
--- 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>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
index ee42e03f07..95eff7ead6 100644
--- 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'/>
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
index f711b34ffe..05cb204ea5 100644
--- 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'/>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 505c66b818..1078a3117a 100644
--- 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",
--
2.31.1
