From 5949b8d714339b3c41b5dab5d1726f38c7749747 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Sat, 6 Feb 2021 13:02:51 +0100
Subject: [PATCH] qemuxml2argvdata: disk-cache: Remove specific machine type

The test doesn't depend on any specific machine type.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---
 tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args  | 2 +-
 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args   | 2 +-
 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args   | 2 +-
 tests/qemuxml2argvdata/disk-cache.x86_64-latest.args  | 3 +--
 tests/qemuxml2argvdata/disk-cache.xml                 | 2 +-
 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml | 2 +-
 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml  | 2 +-
 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml  | 2 +-
 tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
index aa7a230583..538df9e5ca 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.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 pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.12,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/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
index 64fd4308e4..9854454a7e 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.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 pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.6,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/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
index a6a448999b..3d034ae488 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.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 pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.7,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/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
index e66abd9d4f..c93e8d4653 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
@@ -12,8 +12,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off,\
-memory-backend=pc.ram \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -cpu qemu64 \
 -m 214 \
 -object memory-backend-ram,id=pc.ram,size=224395264 \
diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata/disk-cache.xml
index 5cbbd2f3bc..e1ba6f953f 100644
--- a/tests/qemuxml2argvdata/disk-cache.xml
+++ b/tests/qemuxml2argvdata/disk-cache.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
index 880eb71d04..dc45c829d1 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
index 880eb71d04..ab86e3d787 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.6'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
index 880eb71d04..6e76fa6251 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.7'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
index e992d9db1c..8ede745da4 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>