mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-12-22 13:34:07 +03:00
tests: Remove old rhel7 domcaps data
This doesn't hit any code path we care about anymore Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
parent
eb58c09f48
commit
adae7bf1e5
@ -1,135 +0,0 @@
|
||||
<domainCapabilities>
|
||||
<path>/usr/libexec/qemu-kvm</path>
|
||||
<domain>kvm</domain>
|
||||
<machine>pc-i440fx-rhel7.0.0</machine>
|
||||
<arch>x86_64</arch>
|
||||
<vcpu max='240'/>
|
||||
<iothreads supported='no'/>
|
||||
<os supported='yes'>
|
||||
<loader supported='yes'>
|
||||
<value>/usr/share/OVMF/OVMF_CODE.secboot.fd</value>
|
||||
<enum name='type'>
|
||||
<value>rom</value>
|
||||
<value>pflash</value>
|
||||
</enum>
|
||||
<enum name='readonly'>
|
||||
<value>yes</value>
|
||||
<value>no</value>
|
||||
</enum>
|
||||
</loader>
|
||||
</os>
|
||||
<cpu>
|
||||
<mode name='host-passthrough' supported='yes'/>
|
||||
<mode name='host-model' supported='yes'>
|
||||
<model fallback='allow'>Skylake-Client-IBRS</model>
|
||||
<vendor>Intel</vendor>
|
||||
<feature policy='require' name='ss'/>
|
||||
<feature policy='require' name='vmx'/>
|
||||
<feature policy='require' name='osxsave'/>
|
||||
<feature policy='require' name='hypervisor'/>
|
||||
<feature policy='require' name='tsc_adjust'/>
|
||||
<feature policy='require' name='clflushopt'/>
|
||||
<feature policy='require' name='stibp'/>
|
||||
<feature policy='require' name='ssbd'/>
|
||||
<feature policy='require' name='xsaves'/>
|
||||
<feature policy='require' name='pdpe1gb'/>
|
||||
</mode>
|
||||
<mode name='custom' supported='yes'>
|
||||
<model usable='unknown'>EPYC-IBPB</model>
|
||||
<model usable='unknown'>EPYC</model>
|
||||
<model usable='unknown'>Opteron_G5</model>
|
||||
<model usable='unknown'>Opteron_G4</model>
|
||||
<model usable='unknown'>Opteron_G3</model>
|
||||
<model usable='unknown'>Opteron_G2</model>
|
||||
<model usable='unknown'>Opteron_G1</model>
|
||||
<model usable='unknown'>Skylake-Server-IBRS</model>
|
||||
<model usable='unknown'>Skylake-Server</model>
|
||||
<model usable='unknown'>Skylake-Client-IBRS</model>
|
||||
<model usable='unknown'>Skylake-Client</model>
|
||||
<model usable='unknown'>Broadwell-IBRS</model>
|
||||
<model usable='unknown'>Broadwell</model>
|
||||
<model usable='unknown'>Haswell-IBRS</model>
|
||||
<model usable='unknown'>Haswell</model>
|
||||
<model usable='unknown'>IvyBridge-IBRS</model>
|
||||
<model usable='unknown'>IvyBridge</model>
|
||||
<model usable='unknown'>SandyBridge-IBRS</model>
|
||||
<model usable='unknown'>SandyBridge</model>
|
||||
<model usable='unknown'>Westmere-IBRS</model>
|
||||
<model usable='unknown'>Westmere</model>
|
||||
<model usable='unknown'>Nehalem-IBRS</model>
|
||||
<model usable='unknown'>Nehalem</model>
|
||||
<model usable='unknown'>Penryn</model>
|
||||
<model usable='unknown'>Conroe</model>
|
||||
<model usable='unknown'>cpu64-rhel6</model>
|
||||
<model usable='unknown'>n270</model>
|
||||
<model usable='unknown'>athlon</model>
|
||||
<model usable='unknown'>pentium3</model>
|
||||
<model usable='unknown'>pentium2</model>
|
||||
<model usable='unknown'>pentium</model>
|
||||
<model usable='unknown'>486</model>
|
||||
<model usable='unknown'>coreduo</model>
|
||||
<model usable='unknown'>kvm32</model>
|
||||
<model usable='unknown'>qemu32</model>
|
||||
<model usable='unknown'>kvm64</model>
|
||||
<model usable='unknown'>core2duo</model>
|
||||
<model usable='unknown'>phenom</model>
|
||||
<model usable='unknown'>qemu64</model>
|
||||
</mode>
|
||||
</cpu>
|
||||
<devices>
|
||||
<disk supported='yes'>
|
||||
<enum name='diskDevice'>
|
||||
<value>disk</value>
|
||||
<value>cdrom</value>
|
||||
<value>floppy</value>
|
||||
<value>lun</value>
|
||||
</enum>
|
||||
<enum name='bus'>
|
||||
<value>ide</value>
|
||||
<value>fdc</value>
|
||||
<value>scsi</value>
|
||||
<value>virtio</value>
|
||||
<value>usb</value>
|
||||
<value>sata</value>
|
||||
</enum>
|
||||
</disk>
|
||||
<graphics supported='yes'>
|
||||
<enum name='type'>
|
||||
<value>sdl</value>
|
||||
<value>vnc</value>
|
||||
<value>spice</value>
|
||||
</enum>
|
||||
</graphics>
|
||||
<video supported='yes'>
|
||||
<enum name='modelType'>
|
||||
<value>vga</value>
|
||||
<value>cirrus</value>
|
||||
<value>qxl</value>
|
||||
</enum>
|
||||
</video>
|
||||
<hostdev supported='yes'>
|
||||
<enum name='mode'>
|
||||
<value>subsystem</value>
|
||||
</enum>
|
||||
<enum name='startupPolicy'>
|
||||
<value>default</value>
|
||||
<value>mandatory</value>
|
||||
<value>requisite</value>
|
||||
<value>optional</value>
|
||||
</enum>
|
||||
<enum name='subsysType'>
|
||||
<value>usb</value>
|
||||
<value>pci</value>
|
||||
<value>scsi</value>
|
||||
</enum>
|
||||
<enum name='capsType'/>
|
||||
<enum name='pciBackend'/>
|
||||
</hostdev>
|
||||
</devices>
|
||||
<features>
|
||||
<gic supported='no'/>
|
||||
<vmcoreinfo supported='yes'/>
|
||||
<genid supported='no'/>
|
||||
<sev supported='no'/>
|
||||
</features>
|
||||
</domainCapabilities>
|
||||
@ -1,143 +0,0 @@
|
||||
<capabilities>
|
||||
|
||||
<host>
|
||||
<uuid>159a491e-8d68-439e-8d3f-7f7b3d417e4d</uuid>
|
||||
<cpu>
|
||||
<arch>x86_64</arch>
|
||||
<model>Skylake-Client-IBRS</model>
|
||||
<vendor>Intel</vendor>
|
||||
<microcode version='1'/>
|
||||
<topology sockets='8' cores='1' threads='1'/>
|
||||
<feature name='ss'/>
|
||||
<feature name='vmx'/>
|
||||
<feature name='osxsave'/>
|
||||
<feature name='hypervisor'/>
|
||||
<feature name='tsc_adjust'/>
|
||||
<feature name='clflushopt'/>
|
||||
<feature name='stibp'/>
|
||||
<feature name='ssbd'/>
|
||||
<feature name='xsaves'/>
|
||||
<feature name='pdpe1gb'/>
|
||||
<pages unit='KiB' size='4'/>
|
||||
<pages unit='KiB' size='2048'/>
|
||||
<pages unit='KiB' size='1048576'/>
|
||||
</cpu>
|
||||
<power_management>
|
||||
<suspend_mem/>
|
||||
<suspend_disk/>
|
||||
<suspend_hybrid/>
|
||||
</power_management>
|
||||
<iommu support='no'/>
|
||||
<migration_features>
|
||||
<live/>
|
||||
<uri_transports>
|
||||
<uri_transport>tcp</uri_transport>
|
||||
<uri_transport>rdma</uri_transport>
|
||||
</uri_transports>
|
||||
</migration_features>
|
||||
<topology>
|
||||
<cells num='1'>
|
||||
<cell id='0'>
|
||||
<memory unit='KiB'>4193772</memory>
|
||||
<pages unit='KiB' size='4'>1048443</pages>
|
||||
<pages unit='KiB' size='2048'>0</pages>
|
||||
<pages unit='KiB' size='1048576'>0</pages>
|
||||
<distances>
|
||||
<sibling id='0' value='10'/>
|
||||
</distances>
|
||||
<cpus num='8'>
|
||||
<cpu id='0' socket_id='0' core_id='0' siblings='0'/>
|
||||
<cpu id='1' socket_id='1' core_id='0' siblings='1'/>
|
||||
<cpu id='2' socket_id='2' core_id='0' siblings='2'/>
|
||||
<cpu id='3' socket_id='3' core_id='0' siblings='3'/>
|
||||
<cpu id='4' socket_id='4' core_id='0' siblings='4'/>
|
||||
<cpu id='5' socket_id='5' core_id='0' siblings='5'/>
|
||||
<cpu id='6' socket_id='6' core_id='0' siblings='6'/>
|
||||
<cpu id='7' socket_id='7' core_id='0' siblings='7'/>
|
||||
</cpus>
|
||||
</cell>
|
||||
</cells>
|
||||
</topology>
|
||||
<cache>
|
||||
<bank id='0' level='3' type='both' size='16' unit='MiB' cpus='0'/>
|
||||
<bank id='1' level='3' type='both' size='16' unit='MiB' cpus='1'/>
|
||||
<bank id='2' level='3' type='both' size='16' unit='MiB' cpus='2'/>
|
||||
<bank id='3' level='3' type='both' size='16' unit='MiB' cpus='3'/>
|
||||
<bank id='4' level='3' type='both' size='16' unit='MiB' cpus='4'/>
|
||||
<bank id='5' level='3' type='both' size='16' unit='MiB' cpus='5'/>
|
||||
<bank id='6' level='3' type='both' size='16' unit='MiB' cpus='6'/>
|
||||
<bank id='7' level='3' type='both' size='16' unit='MiB' cpus='7'/>
|
||||
</cache>
|
||||
<secmodel>
|
||||
<model>selinux</model>
|
||||
<doi>0</doi>
|
||||
<baselabel type='kvm'>system_u:system_r:svirt_t:s0</baselabel>
|
||||
<baselabel type='qemu'>system_u:system_r:svirt_tcg_t:s0</baselabel>
|
||||
</secmodel>
|
||||
<secmodel>
|
||||
<model>dac</model>
|
||||
<doi>0</doi>
|
||||
<baselabel type='kvm'>+0:+0</baselabel>
|
||||
<baselabel type='qemu'>+0:+0</baselabel>
|
||||
</secmodel>
|
||||
</host>
|
||||
|
||||
<guest>
|
||||
<os_type>hvm</os_type>
|
||||
<arch name='i686'>
|
||||
<wordsize>32</wordsize>
|
||||
<emulator>/usr/libexec/qemu-kvm</emulator>
|
||||
<machine maxCpus='240'>pc-i440fx-rhel7.0.0</machine>
|
||||
<machine canonical='pc-i440fx-rhel7.0.0' maxCpus='240'>pc</machine>
|
||||
<machine maxCpus='240'>rhel6.0.0</machine>
|
||||
<machine maxCpus='240'>rhel6.1.0</machine>
|
||||
<machine maxCpus='240'>rhel6.2.0</machine>
|
||||
<machine maxCpus='240'>rhel6.3.0</machine>
|
||||
<machine maxCpus='240'>rhel6.4.0</machine>
|
||||
<machine maxCpus='240'>rhel6.5.0</machine>
|
||||
<machine maxCpus='240'>rhel6.6.0</machine>
|
||||
<domain type='qemu'/>
|
||||
<domain type='kvm'>
|
||||
<emulator>/usr/libexec/qemu-kvm</emulator>
|
||||
</domain>
|
||||
</arch>
|
||||
<features>
|
||||
<cpuselection/>
|
||||
<deviceboot/>
|
||||
<disksnapshot default='off' toggle='no'/>
|
||||
<acpi default='on' toggle='yes'/>
|
||||
<apic default='on' toggle='no'/>
|
||||
<pae/>
|
||||
<nonpae/>
|
||||
</features>
|
||||
</guest>
|
||||
|
||||
<guest>
|
||||
<os_type>hvm</os_type>
|
||||
<arch name='x86_64'>
|
||||
<wordsize>64</wordsize>
|
||||
<emulator>/usr/libexec/qemu-kvm</emulator>
|
||||
<machine maxCpus='240'>pc-i440fx-rhel7.0.0</machine>
|
||||
<machine canonical='pc-i440fx-rhel7.0.0' maxCpus='240'>pc</machine>
|
||||
<machine maxCpus='240'>rhel6.0.0</machine>
|
||||
<machine maxCpus='240'>rhel6.1.0</machine>
|
||||
<machine maxCpus='240'>rhel6.2.0</machine>
|
||||
<machine maxCpus='240'>rhel6.3.0</machine>
|
||||
<machine maxCpus='240'>rhel6.4.0</machine>
|
||||
<machine maxCpus='240'>rhel6.5.0</machine>
|
||||
<machine maxCpus='240'>rhel6.6.0</machine>
|
||||
<domain type='qemu'/>
|
||||
<domain type='kvm'>
|
||||
<emulator>/usr/libexec/qemu-kvm</emulator>
|
||||
</domain>
|
||||
</arch>
|
||||
<features>
|
||||
<cpuselection/>
|
||||
<deviceboot/>
|
||||
<disksnapshot default='off' toggle='no'/>
|
||||
<acpi default='on' toggle='yes'/>
|
||||
<apic default='on' toggle='no'/>
|
||||
</features>
|
||||
</guest>
|
||||
|
||||
</capabilities>
|
||||
@ -1,97 +0,0 @@
|
||||
<domain type="kvm">
|
||||
<name>vm1</name>
|
||||
<uuid>00000000-1111-2222-3333-444444444444</uuid>
|
||||
<memory>65536</memory>
|
||||
<currentMemory>65536</currentMemory>
|
||||
<vcpu>1</vcpu>
|
||||
<os>
|
||||
<type arch="x86_64" machine="pc-i440fx-rhel7.0.0">hvm</type>
|
||||
<boot dev="network"/>
|
||||
</os>
|
||||
<features>
|
||||
<acpi/>
|
||||
<apic/>
|
||||
</features>
|
||||
<cpu mode="custom" match="exact">
|
||||
<model>Skylake-Client-IBRS</model>
|
||||
<feature policy="require" name="spec-ctrl"/>
|
||||
<feature policy="require" name="ssbd"/>
|
||||
</cpu>
|
||||
<clock offset="utc">
|
||||
<timer name="rtc" tickpolicy="catchup"/>
|
||||
<timer name="pit" tickpolicy="delay"/>
|
||||
<timer name="hpet" present="no"/>
|
||||
</clock>
|
||||
<on_reboot>destroy</on_reboot>
|
||||
<pm>
|
||||
<suspend-to-mem enabled="no"/>
|
||||
<suspend-to-disk enabled="no"/>
|
||||
</pm>
|
||||
<devices>
|
||||
<emulator>/usr/libexec/qemu-kvm</emulator>
|
||||
<controller type="usb" model="ich9-ehci1"/>
|
||||
<controller type="usb" model="ich9-uhci1">
|
||||
<master startport="0"/>
|
||||
</controller>
|
||||
<controller type="usb" model="ich9-uhci2">
|
||||
<master startport="2"/>
|
||||
</controller>
|
||||
<controller type="usb" model="ich9-uhci3">
|
||||
<master startport="4"/>
|
||||
</controller>
|
||||
<interface type="bridge">
|
||||
<source bridge="testsuitebr0"/>
|
||||
<mac address="00:11:22:33:44:55"/>
|
||||
<model type="e1000"/>
|
||||
</interface>
|
||||
<console type="pty"/>
|
||||
</devices>
|
||||
</domain>
|
||||
<domain type="kvm">
|
||||
<name>vm1</name>
|
||||
<uuid>00000000-1111-2222-3333-444444444444</uuid>
|
||||
<memory>65536</memory>
|
||||
<currentMemory>65536</currentMemory>
|
||||
<vcpu>1</vcpu>
|
||||
<os>
|
||||
<type arch="x86_64" machine="pc-i440fx-rhel7.0.0">hvm</type>
|
||||
<boot dev="network"/>
|
||||
</os>
|
||||
<features>
|
||||
<acpi/>
|
||||
<apic/>
|
||||
</features>
|
||||
<cpu mode="custom" match="exact">
|
||||
<model>Skylake-Client-IBRS</model>
|
||||
<feature policy="require" name="spec-ctrl"/>
|
||||
<feature policy="require" name="ssbd"/>
|
||||
</cpu>
|
||||
<clock offset="utc">
|
||||
<timer name="rtc" tickpolicy="catchup"/>
|
||||
<timer name="pit" tickpolicy="delay"/>
|
||||
<timer name="hpet" present="no"/>
|
||||
</clock>
|
||||
<pm>
|
||||
<suspend-to-mem enabled="no"/>
|
||||
<suspend-to-disk enabled="no"/>
|
||||
</pm>
|
||||
<devices>
|
||||
<emulator>/usr/libexec/qemu-kvm</emulator>
|
||||
<controller type="usb" model="ich9-ehci1"/>
|
||||
<controller type="usb" model="ich9-uhci1">
|
||||
<master startport="0"/>
|
||||
</controller>
|
||||
<controller type="usb" model="ich9-uhci2">
|
||||
<master startport="2"/>
|
||||
</controller>
|
||||
<controller type="usb" model="ich9-uhci3">
|
||||
<master startport="4"/>
|
||||
</controller>
|
||||
<interface type="bridge">
|
||||
<source bridge="testsuitebr0"/>
|
||||
<mac address="00:11:22:33:44:55"/>
|
||||
<model type="e1000"/>
|
||||
</interface>
|
||||
<console type="pty"/>
|
||||
</devices>
|
||||
</domain>
|
||||
@ -799,7 +799,6 @@ c.add_compare("--cpuset auto --vcpus 2", "cpuset-auto") # --cpuset=auto actuall
|
||||
c.add_compare("--memory hotplugmemorymax=2048,hotplugmemoryslots=2 --cpu cell0.cpus=0,cell0.memory=1048576 --memdev dimm,access=private,target_size=512,target_node=0,source_pagesize=4,source_nodemask=1-2 --memdev nvdimm,source_path=/path/to/nvdimm,target_size=512,target_node=0,target_label_size=128,alias.name=mymemdev3", "memory-hotplug", precompare_check="5.3.0")
|
||||
c.add_compare("--memory currentMemory=100,memory=200,maxmemory=300,maxMemory=400,maxMemory.slots=1", "memory-option-backcompat", precompare_check="5.3.0")
|
||||
c.add_compare("--connect " + utils.URIs.kvm_q35 + " --cpu qemu64,secure=off", "cpu-disable-sec") # disable security features that are added by default
|
||||
c.add_compare("--connect " + utils.URIs.kvm_rhel, "cpu-rhel7-default", precompare_check="5.1.0") # default CPU for old QEMU where we cannot use host-model
|
||||
c.add_compare("--cpu host-passthrough,migratable=on", "cpu-host-passthrough-migratable") # Passthrough with migratable attribute
|
||||
c.add_compare("--cpu host-model,model.fallback=forbid", "cpu-host-model-no-fallback") # Host-Model with fallback disabled
|
||||
c.add_compare("--cpu model=core2duo,model.fallback=allow,model.vendor_id=GenuineIntel", "cpu-model") # Specific CPU with fallback enabled
|
||||
|
||||
@ -94,14 +94,12 @@ class _URIs(object):
|
||||
self.kvm_session = _m("qemu:///session") + _kvm_x86_caps
|
||||
|
||||
_uri_kvm = _uri_qemu + _kvm_x86_caps
|
||||
_uri_kvm_rhel7 = _uri_qemu + _domcaps("kvm-x86_64-rhel7-domcaps.xml")
|
||||
_uri_kvm_q35 = _uri_qemu + _domcaps("kvm-x86_64-domcaps-q35.xml")
|
||||
_uri_kvm_amd_sev = _uri_qemu + _domcaps("kvm-x86_64-domcaps-amd-sev.xml")
|
||||
_uri_kvm_aarch64 = _uri_qemu + _domcaps("kvm-aarch64-domcaps.xml")
|
||||
_uri_qemu_riscv64 = _uri_qemu + _domcaps("qemu-riscv64-domcaps.xml")
|
||||
|
||||
self.kvm_nodomcaps = _uri_qemu + _caps("kvm-x86_64.xml")
|
||||
self.kvm_rhel = _uri_kvm_rhel7 + _caps("kvm-x86_64-rhel7.xml")
|
||||
self.kvm_q35 = _uri_kvm_q35 + _caps("kvm-x86_64.xml")
|
||||
self.kvm_amd_sev = _uri_kvm_amd_sev + _caps("kvm-x86_64.xml")
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user