tests: qemuxml2argvdata: Purge versioned i440fx machine types from fake-caps tests

Use the 'pc' alias for them as it's equivalent.

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

diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index e84d6ce6a7b094a3c728a8df4bc5cd5c5e218f98..df5dc2f37a723726b4a8b02568f572adeffb13d9 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 14336 \
 -mem-prealloc \

diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
index cf90ae9f3f5860a41a8ebb91950a862aa9246417..2a986e6d8385e3422e4fed5f7c5dc16cc39cebf0 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>8</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index 1e1bb809129b35eb3995a7c39a2c095b2f1ad89e..dd5da42661a41f93b49aeeb3e27f856ca540604e 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 14336 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
index 8bc0a68ed440713a693bfb69a2513cd9ded25f6d..22719b9545dcf174ff4ce68903e5f02bcfbcc2a9 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>8</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 17accabf6a18a544acd8e525bf356a1cb5f760ba..1b27d6b7bfeda9df80b687a86e7f178d88885ee7 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 28672 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index d054963eb8292d97ec9d2e805e239ce98f773f8e..f6af88a2a8f9faebfea1b238c86ef5a4f762b2e5 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>20</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index a838877a03060c8dd42e8af512ae0e503e80f59f..a324ce13fd71df0665017c59f3aa0d144947eee0 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 43008 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 139bdfd8710f1a8cf5a4afba91338add577ca253..1bf006c21cde82622092e0e2676349abfdff43c3 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>32</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
index 1d8ecbcf526cb7bc1af8e317bd7430b3146b4709..f8559a99f2868ab5d59c3413c36e6ba127717f69 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -name guest=fedora,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
--machine pc-i440fx-2.9,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 4096 \

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxml2argvdata/hugepages-memaccess3.xml
index a9d2cd9da01af2bc8ed615e1da8c0cdb967a05de..54b27e971d0e605bd658730fb8f30f4534be9ae6 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess3.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess3.xml
@@ -9,7 +9,7 @@
   </memoryBacking>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <bootmenu enable='yes'/>
   </os>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index f5c79572b8ab2e1e62be138fbb7d29bf52ae9fba..f560cabf8e22cca745f6ce04d22ab3fc38b01aad 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fedora,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m size=1048576k,slots=16,maxmem=1099511627776k \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
index 51768334d2f1f4a7830cbc1be7126b8ff09518e8..260cbb4869b7fb572b46c7e4097853c40f2b7c63 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
@@ -9,7 +9,7 @@
   </memoryBacking>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.args
index 0cf0bdae39b782a0a35aafe51988921403e98024..ed380257971202a2eeb82231f848f6e5048cfc27 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fedora,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.xml b/tests/qemuxml2argvdata/hugepages-numa-default.xml
index 6bbd80d515b9f5d734fee8ae9dbc10d57784f621..d7c82cd8c10556e502ac30a1932eadfc346218fb 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.xml
@@ -8,7 +8,7 @@
   </memoryBacking>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
index d1dd0c18835c563c56c3f4dfba6d34e73c4415f7..2ebe9c135055b5d265a1426e844dd4005f212260 100644 (file)
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=fedora,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m size=1048576k,slots=16,maxmem=1099511627776k \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.xml b/tests/qemuxml2argvdata/pages-dimm-discard.xml
index 75aa21f0c71a589e8d8e85be6d93611978e7109e..de7e63ad328b031b77ed4505242b1729f1b05b63 100644 (file)
--- a/tests/qemuxml2argvdata/pages-dimm-discard.xml
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.xml
@@ -6,7 +6,7 @@
   <currentMemory unit='KiB'>2621439</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 7b28ad6851b970d1549ec9c592f6b6458189a229..659440636c24fdcce12648ada7cafc0c416e5943 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=lots-of-disks,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-lots-of-disks/master-key.aes \
--machine pc-i440fx-1.4,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -cpu qemu64,kvmclock=off \
 -bios /usr/share/seabios/bios.bin \

diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.xml b/tests/qemuxml2argvdata/pci-bridge-many-disks.xml
index 8f87f2a93e424b149780333cfbe16696f1eac14c..500057407395cef4f394454c781e9ae22c88045b 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.xml
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>4000768</memory>
   <currentMemory unit='KiB'>4000000</currentMemory>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.4'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <loader>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>

diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml b/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml
index 85c1115da40e2262e539b49d0ce1c1eb0077d00c..237b718e732f9628e914e215268c973008e2af02 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml
+++ b/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>16</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml b/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml
index 2c390eae8cbf33d9f8862a5c6e6b4181ab96ab5c..3adae42317ec81b14036e7489bb21a8180fef1d9 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml
+++ b/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>16</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args
index 988ad945451c5b5da0cb6f1c3737d986dc3d8887..2b8ad5d3bf6e7b9a0a2a2d22bcc750dd1b2c580d 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=expander-test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-expander-test/master-key.aes \
--machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/pci-expander-bus.xml b/tests/qemuxml2argvdata/pci-expander-bus.xml
index d9aeda1757bb79a4dab7188e74c7a72de3956183..53a8943d7346aae59c63d0a0c3dcc39f9176a926 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus.xml
+++ b/tests/qemuxml2argvdata/pci-expander-bus.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>16</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <cpu>
     <topology sockets='2' dies='1' cores='4' threads='2'/>

diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
index 1c27047b757a6554808d7e0b53f2b0b4518206bd..5d01336ebbeb9f9270b0046cb249886e63e16035 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
+++ b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>16</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <cpu>
     <topology sockets='2' dies='1' cores='4' threads='2'/>

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
index e954250009ba563fda02038764ac54179a7ea813..d50b8f4aba6073f92540d24aacf23de2dd73bdba 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args
index 92a0ae78b153e97b734715b74402d483ec76677a..1c04eddf1218a6112f36137470cfcb76d2ce676b 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=gentoo,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-gentoo/master-key.aes \
--machine pc-i440fx-1.4,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 4096 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/user-aliases-usb.xml b/tests/qemuxml2argvdata/user-aliases-usb.xml
index 668a9c384b86cae3075315419387b7ef78342125..87b343dc51cd1d7b46957d7d1a29116edd5434c7 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases-usb.xml
+++ b/tests/qemuxml2argvdata/user-aliases-usb.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.4'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <boot dev='cdrom'/>
   </os>

diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
index 486473a5666f1c6f6bef9f4a0178a7a5bb35ca3a..248469a6682e288a38e744920ccc0beba86a1d02 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=gentoo,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-gentoo/master-key.aes \
--machine pc-i440fx-1.4,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
 -accel kvm \
 -m 4096 \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml
index 10b774952182113608ba9b243f067658709813bb..b688b84b565e1c8fb280d96ead52ea27c75c159a 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases.xml
+++ b/tests/qemuxml2argvdata/user-aliases.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.4'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <boot dev='cdrom'/>
   </os>

diff --git a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
index 08969c773db735cb0da0367dba68caccfee97093..9584c81ae9140a079e293333fa6f307ccdf00b55 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4000000</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-1.4'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <loader type='rom'>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>

diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
index dbabf55f74d499bf9dc78742866fda0af2ffe80b..7263d71e9a6106a8aed643e5ed538f54ac022ae2 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>16</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
index e232a415009005693a45ed22c00c75321a165a92..09c019e474a6b44d044a6d316378d72a3f9b265f 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>