From fab7af30a156cec5684b3e715bf9223f8b2a8b71 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 11 Apr 2019 14:47:00 +0200 Subject: [PATCH] tests: add kvm-x86_64-rhel7-domcaps Signed-off-by: Pavel Hrdina --- .../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 @@ + + /usr/libexec/qemu-kvm + kvm + pc-i440fx-rhel7.0.0 + x86_64 + + + + + /usr/share/OVMF/OVMF_CODE.secboot.fd + + rom + pflash + + + yes + no + + + + + + + Skylake-Client-IBRS + Intel + + + + + + + + + + + + + EPYC-IBPB + EPYC + Opteron_G5 + Opteron_G4 + Opteron_G3 + Opteron_G2 + Opteron_G1 + Skylake-Server-IBRS + Skylake-Server + Skylake-Client-IBRS + Skylake-Client + Broadwell-IBRS + Broadwell + Haswell-IBRS + Haswell + IvyBridge-IBRS + IvyBridge + SandyBridge-IBRS + SandyBridge + Westmere-IBRS + Westmere + Nehalem-IBRS + Nehalem + Penryn + Conroe + cpu64-rhel6 + n270 + athlon + pentium3 + pentium2 + pentium + 486 + coreduo + kvm32 + qemu32 + kvm64 + core2duo + phenom + qemu64 + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + sata + + + + + sdl + vnc + spice + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + + + + + + + + + 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"