Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- .../kvm-x86_64-rhel7-domcaps.xml | 135 ++++++++++++++++++ tests/utils.py | 3 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 tests/capabilities-xml/kvm-x86_64-rhel7-domcaps.xml diff --git a/tests/capabilities-xml/kvm-x86_64-rhel7-domcaps.xml b/tests/capabilities-xml/kvm-x86_64-rhel7-domcaps.xml new file mode 100644 index 00000000..904ad70b --- /dev/null +++ b/tests/capabilities-xml/kvm-x86_64-rhel7-domcaps.xml @@ -0,0 +1,135 @@ +<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> diff --git a/tests/utils.py b/tests/utils.py index f8d5b2ad..f74d16ce 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -72,6 +72,7 @@ class _URIs(object): _uri_qemu = "%s,qemu" % self.test_full _uri_kvm = _uri_qemu + _domcaps("kvm-x86_64-domcaps.xml") + _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_aarch64 = _uri_qemu + _domcaps("kvm-aarch64-domcaps.xml") _uri_qemu_riscv64 = _uri_qemu + _domcaps("qemu-riscv64-domcaps.xml") @@ -79,7 +80,7 @@ class _URIs(object): self.kvm = _uri_kvm + _caps("kvm-x86_64.xml") self.kvm_remote = _uri_kvm + _caps("kvm-x86_64.xml") + ",remote" self.kvm_nodomcaps = _uri_qemu + _caps("kvm-x86_64.xml") - self.kvm_rhel = _uri_kvm + _caps("kvm-x86_64-rhel7.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_session = self.kvm + ",session" -- 2.20.1 _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list