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>
2022-01-05 11:52:04 +01:00 · 2022-01-05 11:52:04 +01:00 · e3a2117488
parent ee12bd7b8a
commit e3a2117488
31 changed files with 31 additions and 31 deletions
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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>
--- 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>
--- 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 \
--- 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'/>
--- 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'/>
--- 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>
--- 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 \
--- 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>
--- 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 \
--- 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>
--- 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>
--- 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>
--- 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>