External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Krempa 2022-01-05 11:52:04 +01:00
parent ee12bd7b8a
commit e3a2117488
31 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
View File

@ -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 \

2
tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
View File

@ -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>

2
tests/qemuxml2argvdata/fd-memory-numa-topology.args
View File

@ -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 \

2
tests/qemuxml2argvdata/fd-memory-numa-topology.xml
View File

@ -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>

2
tests/qemuxml2argvdata/fd-memory-numa-topology2.args
View File

@ -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 \

2
tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
View File

@ -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>

2
tests/qemuxml2argvdata/fd-memory-numa-topology3.args
View File

@ -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 \

2
tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
View File

@ -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>

2
tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
View File

@ -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 \

2
tests/qemuxml2argvdata/hugepages-memaccess3.xml
View File

@ -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>

2
tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
View File

@ -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 \

2
tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
View File

@ -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>

2
tests/qemuxml2argvdata/hugepages-numa-default.args
View File

@ -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 \

2
tests/qemuxml2argvdata/hugepages-numa-default.xml
View File

@ -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>

2
tests/qemuxml2argvdata/pages-dimm-discard.args
View File

@ -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 \

2
tests/qemuxml2argvdata/pages-dimm-discard.xml
View File

@ -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>

2
tests/qemuxml2argvdata/pci-bridge-many-disks.args
View File

@ -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 \

2
tests/qemuxml2argvdata/pci-bridge-many-disks.xml
View File

@ -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>

2
tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml
View File

@ -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>

2
tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml
View File

@ -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>

2
tests/qemuxml2argvdata/pci-expander-bus.args
View File

@ -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 \

2
tests/qemuxml2argvdata/pci-expander-bus.xml
View File

@ -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'/>

2
tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
View File

@ -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'/>

2
tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
View File

@ -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>

2
tests/qemuxml2argvdata/user-aliases-usb.args
View File

@ -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 \

2
tests/qemuxml2argvdata/user-aliases-usb.xml
View File

@ -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>

2
tests/qemuxml2argvdata/user-aliases.args
View File

@ -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 \

2
tests/qemuxml2argvdata/user-aliases.xml
View File

@ -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>

2
tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
View File

@ -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>

2
tests/qemuxml2xmloutdata/pci-expander-bus.xml
View File

@ -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>

2
tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
View File

@ -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>