External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

2
tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -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 \ -accel kvm \
-m 214 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory> <currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.0'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvdata/pci-autoadd-addr.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \ -name guest=fdr-br,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \ -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 \ -accel tcg \
-m 2048 \ -m 2048 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/pci-autoadd-addr.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

2
tests/qemuxml2argvdata/pci-autoadd-idx.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \ -name guest=fdr-br,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \ -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 \ -accel tcg \
-m 2048 \ -m 2048 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/pci-autoadd-idx.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

2
tests/qemuxml2argvdata/pci-autofill-addr.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \ -name guest=fdr-br,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \ -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 \ -accel tcg \
-m 2048 \ -m 2048 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/pci-autofill-addr.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<devices> <devices>

2
tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
View File

@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<devices> <devices>

2
tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
View File

@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<devices> <devices>

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

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \ -name guest=fdr-br,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \ -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 \ -accel tcg \
-m 2048 \ -m 2048 \
-realtime mlock=off \ -realtime mlock=off \

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

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

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

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \ -name guest=fdr-br,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \ -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 \ -accel tcg \
-m 2048 \ -m 2048 \
-realtime mlock=off \ -realtime mlock=off \

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

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

2
tests/qemuxml2argvdata/pci-root-address.xml
View File

@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<devices> <devices>

2
tests/qemuxml2argvdata/pci-root-nonzero-index.xml
View File

@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<devices> <devices>

2
tests/qemuxml2argvdata/pcihole64-gib.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvdata/pcihole64-none.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvdata/pcihole64.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=foo,debug-threads=on \ -name guest=foo,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \ -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 \ -accel tcg \
-m 2048 \ -m 2048 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/pcihole64.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

2
tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

2
tests/qemuxml2xmloutdata/pci-autofill-addr.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

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

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

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

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

2
tests/qemuxml2xmloutdata/pcihole64-gib.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2xmloutdata/pcihole64-none.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2xmloutdata/pcihole64.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory> <currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.2'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>