tests: qemuxml2argvdata: Remove specific q35 machine types from fake-caps tests

Use q35 instead.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args
index f7af9f2a0260476ec09af41b3988f8bc7dd58e25..f0799bec3c561da4b060af98ddf098d0d3a9b4f9 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=test-bios,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
--machine pc-q35-2.5,usb=off,smm=on,dump-guest-core=off \
+-machine q35,usb=off,smm=on,dump-guest-core=off \
 -accel tcg \
 -global driver=cfi.pflash01,property=secure,value=on \
 -drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \

diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.xml b/tests/qemuxml2argvdata/bios-nvram-secure.xml
index 5eb84c868e365f3d7de2dea32b7b40f3fec5dc9c..0788bb9b03f8383ae7b9076833452b2fd28f1280 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram-secure.xml
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.5'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <loader readonly='yes' secure='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
     <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram>
     <boot dev='hd'/>

diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args
index 6aa61da3ed586f5655711891f84483fae663ef15..e2df5abc50abba1e332e528ab3cd300c0c4beeb2 100644 (file)
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.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 pc-q35-2.4,usb=off,dump-guest-core=off \
+-machine q35,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.xml b/tests/qemuxml2argvdata/boot-floppy-q35.xml
index 2cececf34051c5bd0d70b25376c8ef5f752f949e..0604cd155b2e6e7d67e3ddcf69e8bf742b27af41 100644 (file)
--- a/tests/qemuxml2argvdata/boot-floppy-q35.xml
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.4'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='fd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index ae5c64be259945e113b3bfc06788c3b39bb2fc8b..fd09c23a1f0575bca44940fdf17dba2eb6e09724 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.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 pc-q35-2.7,usb=off,dump-guest-core=off \
+-machine q35,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 214 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml
index c4e8c33a9399af1d60c6588a34f6174ed0b525de..2678835254163fcd1792f3eb316caef13020b748 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.7'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index c249cc14c6dbd8750ba37017e99e39ae03e38d96..40cc5d7bfb6dd4980304ebe5f29c73142d571a13 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=q35,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \
--machine pc-q35-2.5,usb=off,dump-guest-core=off \
+-machine q35,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml b/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
index 3d2a7d813d4396cd7b70cf876687bb05942035d9..386391b270c645fb95837e86b8ec30fa18df2212 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.5'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='network'/>
   </os>
   <pm>

diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args
index dbe43ea6b07edeaf1d80ac7164b88d219981f144..25c44e502421f21b5eaed2eaf8302a52827ce05a 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=q35,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \
--machine pc-q35-2.5,usb=off,dump-guest-core=off \
+-machine q35,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/q35-pm-disable.xml b/tests/qemuxml2argvdata/q35-pm-disable.xml
index 3d2a7d813d4396cd7b70cf876687bb05942035d9..386391b270c645fb95837e86b8ec30fa18df2212 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable.xml
+++ b/tests/qemuxml2argvdata/q35-pm-disable.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.5'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='network'/>
   </os>
   <pm>

diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index 6e84c9ca2a8e066512f8a1e53c5f248b079e281b..49e0f6794ef7e54f9d448118928e455282df720c 100644 (file)
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=spice \
 -name guest=virt-manager-basic,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes \
--machine pc-q35-2.7,usb=off,vmport=off,dump-guest-core=off \
+-machine q35,usb=off,vmport=off,dump-guest-core=off \
 -accel kvm \
 -m 4096 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.xml b/tests/qemuxml2argvdata/q35-virt-manager-basic.xml
index aaa8ffdc087e1009e21837293b05387c762beb3b..c2d82c2c47fe9325a6893f2feba50fa8f8c2852e 100644 (file)
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.xml
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.7'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2argvdata/user-aliases2.xml b/tests/qemuxml2argvdata/user-aliases2.xml
index a288b861175981cc1e113220586cf22d37bf3935..3a6a088b504aa84717bf1b4dd822afe0fa0f19ae 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases2.xml
+++ b/tests/qemuxml2argvdata/user-aliases2.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.4'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='fd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args
index fa4c9d0c6ba4c4468effe89ae9e92c588e9b9740..4dedbbea6e308199c391de293c886d66dbf11a01 100644 (file)
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=dummy2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-dummy2/master-key.aes \
--machine pc-q35-2.3,usb=off,dump-guest-core=off \
+-machine q35,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 128 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.xml b/tests/qemuxml2argvdata/vcpu-placement-static.xml
index ffdd6cc10a151928bd37f5dba8100e03f5e0dda7..47b70335e51d3441ba98a13f7eae25519b34c895 100644 (file)
--- a/tests/qemuxml2argvdata/vcpu-placement-static.xml
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.xml
@@ -13,7 +13,7 @@
     <memory mode='strict' placement='auto'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.3'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
index f66562e21669d6bcf94ce0f31fc30df4f6cabaaf..dd8db2158c61626c98b2ba9facfcf1818ff65c8e 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.7'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
index b63da06027a6631bd114d5dc3bf20f8dd81aafcb..44770b5fdcd18b3d33eb9480c0aed7ac5c467e40 100644 (file)
--- a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
+++ b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.7'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>