External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2argvdata: Remove specific q35 machine types from fake-caps tests

Browse Source 
Use q35 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 10:19:36 +01:00
parent fe25fb51b1
commit 83bd28dc8f
17 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/bios-nvram-secure.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=test-bios,debug-threads=on \ -name guest=test-bios,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
-machine pc-q35-2.5,usb=off,smm=on,dump-guest-core=off \ -machine q35,usb=off,smm=on,dump-guest-core=off \
-accel tcg \ -accel tcg \
-global driver=cfi.pflash01,property=secure,value=on \ -global driver=cfi.pflash01,property=secure,value=on \
-drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \ -drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \

2
tests/qemuxml2argvdata/bios-nvram-secure.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-q35-2.5'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<loader readonly='yes' secure='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader> <loader readonly='yes' secure='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
<nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram> <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram>
<boot dev='hd'/> <boot dev='hd'/>

2
tests/qemuxml2argvdata/boot-floppy-q35.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-q35-2.4,usb=off,dump-guest-core=off \ -machine q35,usb=off,dump-guest-core=off \
-accel tcg \ -accel tcg \
-m 214 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/boot-floppy-q35.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-q35-2.4'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='fd'/> <boot dev='fd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest2,debug-threads=on \ -name guest=QEMUGuest2,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-machine pc-q35-2.7,usb=off,dump-guest-core=off \ -machine q35,usb=off,dump-guest-core=off \
-accel kvm \ -accel kvm \
-m 214 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.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-q35-2.7'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvdata/q35-pm-disable-fallback.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=q35,debug-threads=on \ -name guest=q35,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \
-machine pc-q35-2.5,usb=off,dump-guest-core=off \ -machine q35,usb=off,dump-guest-core=off \
-accel tcg \ -accel tcg \
-m 1024 \ -m 1024 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-q35-2.5'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<pm> <pm>

2
tests/qemuxml2argvdata/q35-pm-disable.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=q35,debug-threads=on \ -name guest=q35,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \
-machine pc-q35-2.5,usb=off,dump-guest-core=off \ -machine q35,usb=off,dump-guest-core=off \
-accel tcg \ -accel tcg \
-m 1024 \ -m 1024 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/q35-pm-disable.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-q35-2.5'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<pm> <pm>

2
tests/qemuxml2argvdata/q35-virt-manager-basic.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=spice \
-name guest=virt-manager-basic,debug-threads=on \ -name guest=virt-manager-basic,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes \
-machine pc-q35-2.7,usb=off,vmport=off,dump-guest-core=off \ -machine q35,usb=off,vmport=off,dump-guest-core=off \
-accel kvm \ -accel kvm \
-m 4096 \ -m 4096 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/q35-virt-manager-basic.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory> <currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>2</vcpu> <vcpu placement='static'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-q35-2.7'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>

2
tests/qemuxml2argvdata/user-aliases2.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-q35-2.4'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='fd'/> <boot dev='fd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvdata/vcpu-placement-static.args
View File

@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=dummy2,debug-threads=on \ -name guest=dummy2,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-dummy2/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-dummy2/master-key.aes \
-machine pc-q35-2.3,usb=off,dump-guest-core=off \ -machine q35,usb=off,dump-guest-core=off \
-accel kvm \ -accel kvm \
-m 128 \ -m 128 \
-realtime mlock=off \ -realtime mlock=off \

2
tests/qemuxml2argvdata/vcpu-placement-static.xml
View File

@ -13,7 +13,7 @@
<memory mode='strict' placement='auto'/> <memory mode='strict' placement='auto'/>
</numatune> </numatune>
<os> <os>
<type arch='x86_64' machine='pc-q35-2.3'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.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-q35-2.7'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory> <currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>2</vcpu> <vcpu placement='static'>2</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-q35-2.7'>hvm</type> <type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>