]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
tests: qemuxml: Use existing machine type in 'iothreads-virtio-scsi-ccw' case
authorPeter Krempa <pkrempa@redhat.com>
Thu, 23 Jan 2020 09:11:12 +0000 (10:11 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 27 Jan 2020 13:55:03 +0000 (14:55 +0100)
Use the 's390-ccw-virtio' machine type which is actually supported by
the qemu we gathered the test data from.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml

index 231785d87872b274b488b47aa52cb6d9c93f36fe..eadbba352a5077a8957177d35827237840ddb8b3 100644 (file)
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
index 60a38ade247cca7115306975b075e78ed851ffc9..76ce780b6798f718992d7016d75dcf68b78de787 100644 (file)
@@ -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'/>
index 668402b041aba64eb1ead37cf34dcec09051d780..1b4af038323028e20b17e1b5f26f1db3792fb36e 100644 (file)
@@ -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'/>