tests: qemuxml2argvdata: Remove use of 'pc-1.0' and 'pc-1.2' machine types

There's nothing special about the tests requiring to use very old
machine types. Most usage is cargo-culted from other tests. Switch all
the tests to use 'pc' instead.

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

diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
index 20ad935a68d6320c4dbecd4fc8664826a62349d6..f7000ea11df59df253957d796730256d4909613a 100644 (file)
--- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.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-1.0,usb=off,dump-guest-core=off,memory-encryption=lsec0 \
+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-encryption=lsec0 \
 -accel kvm \
 -m 214 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml
index 41ec4cb8723c978034dfe844bed748f2714d02ea..b4f3eb4998ac75058c88780f4b7d056d9d9d636c 100644 (file)
--- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml
+++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.0'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index 4643e87933a2418f1753067e99e9056541485b62..b77611bbdd602d01383acccd3f4b9e464e7be42f 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fdr-br,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 2048 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.xml b/tests/qemuxml2argvdata/pci-autoadd-addr.xml
index 57b920ba0998d23c895f7b9966bb9912d2abc91f..fec2b151edd97ea660ed36d9bbe8d5cd59a68b7e 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.xml
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index bf1f0460d160fb06c46c5f9c5e5e8d83f8858e7e..b9ec27af3f3656076df8c391a902087a03bd7756 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fdr-br,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 2048 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.xml b/tests/qemuxml2argvdata/pci-autoadd-idx.xml
index 0a72956f9e78835468d088ead8fa58ca43050a4f..614a60329e6cf8e34f2ee348da4423064cca3006 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.xml
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
index d30b31e7f59c1bbd0a229474d56a04e7d96ff9a6..002bd37416291d2ec2bb468669790c5262c58336 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fdr-br,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 2048 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.xml b/tests/qemuxml2argvdata/pci-autofill-addr.xml
index a601c50ab938edf146dbfd6f5810a6fff12654d0..1d5dbf9b23eb85b89dace0db5b342d042476cd44 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autofill-addr.xml
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <devices>

diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
index e298d66618c53c8ac6f4653ef2bd63f747c85429..ef7b82823388ffb1b820d82a35d7e8d37b25fc0b 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
+++ b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
@@ -4,7 +4,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <devices>

diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
index 790827ae0411240f0e1030c9f4a706d202bc9375..36a5fafae03a374f57d6da6ec74bf9f7e222e7b5 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
@@ -4,7 +4,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <devices>

diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
index d9a7b78b977cf880a8225f78a3a97fd1c1c5cb52..9608f79dfa9b7fc3dc7b26aab43a4ad0ddb073a2 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fdr-br,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 2048 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pci-bridge.xml b/tests/qemuxml2argvdata/pci-bridge.xml
index c28adfe43ec11f449f0f3f791a087495d2d37ac0..886b8ae641d35eb442dd0413a13dfdae08cccce2 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge.xml
+++ b/tests/qemuxml2argvdata/pci-bridge.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index b098fbaeaba452b33505b1cc39acf3d9adc49861..0139f12ccdc25ea01d072429d39410f8f3882960 100644 (file)
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fdr-br,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 2048 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pci-many.xml b/tests/qemuxml2argvdata/pci-many.xml
index 28654d5a4868b2d4bb4fdb6756076c1142e5a1a8..e5603f04b6027d9d72b33cb1f9ccfc6d0c03d887 100644 (file)
--- a/tests/qemuxml2argvdata/pci-many.xml
+++ b/tests/qemuxml2argvdata/pci-many.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2argvdata/pci-root-address.xml b/tests/qemuxml2argvdata/pci-root-address.xml
index 2f5058b33060a9742807e5bba62298826e30b08e..08b4c61619dde9169e7204993bbb1c9833eaeb5a 100644 (file)
--- a/tests/qemuxml2argvdata/pci-root-address.xml
+++ b/tests/qemuxml2argvdata/pci-root-address.xml
@@ -4,7 +4,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <devices>

diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml b/tests/qemuxml2argvdata/pci-root-nonzero-index.xml
index 5d0dcc7dd519f87ace501e3125c7a27f3a01493c..49fd0f6e6051574af038ca33fa517911f599f06a 100644 (file)
--- a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml
+++ b/tests/qemuxml2argvdata/pci-root-nonzero-index.xml
@@ -4,7 +4,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <devices>

diff --git a/tests/qemuxml2argvdata/pcihole64-gib.xml b/tests/qemuxml2argvdata/pcihole64-gib.xml
index ef5237edd7f20fa03229ef702548ee3c4ef9cb1e..a82c847fdaffe533cdc17ee2fbffafbbb089757e 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64-gib.xml
+++ b/tests/qemuxml2argvdata/pcihole64-gib.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/pcihole64-none.xml b/tests/qemuxml2argvdata/pcihole64-none.xml
index 5f96ef3b0d1f2121e69e90d34c7020e8f6519484..e92474741811471a78dee560dedd546f79214c50 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64-none.xml
+++ b/tests/qemuxml2argvdata/pcihole64-none.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
index 69733910e63d392eebb8ba470c00adceab61d0bd..45e49c7a3fa498dc8de57a63ee4f55213965c90a 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=foo,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 2048 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pcihole64.xml b/tests/qemuxml2argvdata/pcihole64.xml
index 7ed2ce3ba488e2dd5c24bc51646eeb66d2b7d8ce..0b289b173358d7da2d5b958ace2d5606a0a61908 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64.xml
+++ b/tests/qemuxml2argvdata/pcihole64.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
index cff6b2fa4d8500f8e42b2676ecb8e0e5c349b390..2670c9d95114dd535683cdf8607901aa5e3851d6 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
index f42c77d2199ba7883287a9aad3effc09ad3e3e4f..8812868ba8d666d915b77e8802ef71c675adad0b 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
index 30dc7625ec622c8c22f49256d1ca58b3c015500f..e12dc4bae36da0c310d870291451a569a2b67e01 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/pci-bridge.xml b/tests/qemuxml2xmloutdata/pci-bridge.xml
index d95660a3819d8d1c144315d5a2c0da0d10da0cf0..46e42a8bc360ec48d31b872398063df0437c5021 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-bridge.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2xmloutdata/pci-many.xml b/tests/qemuxml2xmloutdata/pci-many.xml
index b610e3aa3c2f49999d751afe1f0cff4928cb5021..635bccc696c5d76b6505ac1044fb35d71af61f3b 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-many.xml
+++ b/tests/qemuxml2xmloutdata/pci-many.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
index d9b821bfe2185a29e3efccc2d5f386daf3cc0397..1ad7ca40d8281acdf83e72c46a7be78da061ed31 100644 (file)
--- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml b/tests/qemuxml2xmloutdata/pcihole64-none.xml
index f4941bc67bf1373f33bc4d62699ee20d98754212..c4b12510bf99e676759c6159c721686f772e0c8b 100644 (file)
--- a/tests/qemuxml2xmloutdata/pcihole64-none.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-none.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml b/tests/qemuxml2xmloutdata/pcihole64.xml
index 52d61603aa4148eca4d09e898c8415cbce016ae5..505810722793a74b0d49b04edc3e26ce154aab9f 100644 (file)
--- a/tests/qemuxml2xmloutdata/pcihole64.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>