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

domaincapstest: Add testing infrastructure for the '+hvf' variant

Browse Source 
Allow testing of capabilities of OSX systems with the hvf accelerator.

'domaincapstest' requires special handling as we need to set
VIR_DOMAIN_VIRT_HVF virt type in such case.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-08 15:29:56 +01:00
parent ed93c15f82
commit 738c5bae88
2 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tests/domaincapstest.c
View File

@ -275,6 +275,10 @@ doTestQemuInternal(const char *version,
typestr = "";
break;
case VIR_DOMAIN_VIRT_HVF:
typestr = "-hvf";
break;
default:
abort();
break;
@ -317,43 +321,65 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED,
const char *suffix G_GNUC_UNUSED,
void *opaque)
{
bool hvf = false;
int ret = 0;
/* currently variant tests are not handled here */
if (STRNEQ(variant, ""))
if (STREQ(variant, "+hvf"))
hvf = true;
else if (STREQ(variant, ""))
return 0;
if (STREQ(arch, "x86_64")) {
/* For x86_64 we test three combinations:
/* For x86_64 based on the test variant we test:
*
* '' (default) variant (KVM):
* - KVM with default machine
* - KVM with Q35 machine
* '+hvf' variant:
* - hvf with default machine
*
* - KVM with default machine
* - KVM with Q35 machine
* - TCG with default machine
*/
if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
if (hvf) {
if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_HVF, opaque) < 0)
ret = -1;
} else {
if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
if (doTestQemuInternal(version, "q35", arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
if (doTestQemuInternal(version, "q35", arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
}
if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_QEMU, opaque) < 0)
ret = -1;
} else if (STREQ(arch, "aarch64")) {
/* For aarch64 we test two combinations:
/* For aarch64 based on the test variant we test:
*
* - KVM with default machine
* - KVM with virt machine
* '' (default) variant (KVM):
* - KVM with default machine
* - KVM with virt machine
*
* '+hvf' variant:
* - hvf with default machine
*/
if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
if (hvf) {
if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_HVF, opaque) < 0)
ret = -1;
} else {
if (doTestQemuInternal(version, NULL, arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
if (doTestQemuInternal(version, "virt", arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
if (doTestQemuInternal(version, "virt", arch, variant,
VIR_DOMAIN_VIRT_KVM, opaque) < 0)
ret = -1;
}
} else if (STRPREFIX(arch, "riscv")) {
/* For riscv64 we test two combinations:
*

6
tests/qemucapabilitiesdata/README.rst
View File

@ -52,7 +52,11 @@ or::
Known test variants
-------------------
This section will contain a list of variants that are used in the test suite.
``+hvf``
Variant of the test data using the Apple OSX Hypervisor Framework acceleration
for qemu.
Usage in tests
==============