From 6d9caaaef5e115217b85c83a96cb8ddc1faf4704 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 23 Jan 2020 10:11:12 +0100
Subject: [PATCH] tests: qemuxml: Use existing machine type in
 'iothreads-virtio-scsi-ccw' case

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>
---
 .../iothreads-virtio-scsi-ccw.s390x-latest.args                 | 2 +-
 tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml            | 2 +-
 tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
index 231785d878..eadbba352a 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
@@ -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 \
diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
index 60a38ade24..76ce780b67 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-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/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
index 668402b041..1b4af03832 100644
--- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-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'/>
-- 
GitLab