From 21144ed89cb46a30a5bbcbef575ede77051e140a Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 11 Jun 2021 10:21:57 +0200
Subject: [PATCH] tests: qemuxml2xml: Modernize 's390-defaultconsole' case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don't use the 's390-virtio' machine which was removed in qemu 2.6 and
use real capabilities for the test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/qemuxml2argvdata/s390-defaultconsole.xml                | 2 +-
 ...efaultconsole.xml => s390-defaultconsole.s390x-latest.xml} | 4 +++-
 tests/qemuxml2xmltest.c                                       | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename tests/qemuxml2xmloutdata/{s390-defaultconsole.xml => s390-defaultconsole.s390x-latest.xml} (82%)

diff --git a/tests/qemuxml2argvdata/s390-defaultconsole.xml b/tests/qemuxml2argvdata/s390-defaultconsole.xml
index b85509ba54..0c64e83983 100644
--- a/tests/qemuxml2argvdata/s390-defaultconsole.xml
+++ b/tests/qemuxml2argvdata/s390-defaultconsole.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>262144</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='s390x' machine='s390-virtio'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml b/tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml
similarity index 82%
rename from tests/qemuxml2xmloutdata/s390-defaultconsole.xml
rename to tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml
index d34299116c..212b294291 100644
--- a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml
+++ b/tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml
@@ -5,15 +5,17 @@
   <currentMemory unit='KiB'>262144</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='s390x' machine='s390-virtio'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='host-model' check='partial'/>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
     <serial type='pty'>
       <target type='sclp-serial' port='0'>
         <model name='sclpconsole'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 8ba732d566..3063e52c8f 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1051,8 +1051,7 @@ mymain(void)
             QEMU_CAPS_CCW_CSSID_UNRESTRICTED,
             QEMU_CAPS_DEVICE_VFIO_AP);
 
-    DO_TEST("s390-defaultconsole",
-            QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
+    DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x");
     DO_TEST("s390-panic",
             QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("s390-panic-missing",