External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/virhostdevtest: remove virHostdevHostSupportsPassthroughKVM

Browse Source 
virhostdevtest is using pci mock to emulate all PCI attach/detach
operations. This means that that this test does not rely on KVM
support of the host anymore and the tests in this file shouldn't
be affected by it.

Suggested-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2019-05-02 09:51:52 -03:00 committed by Michal Privoznik
parent f0f1e79bf5
commit 39d4f78a8e
1 changed files with 12 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tests/virhostdevtest.c
View File

@ -126,37 +126,6 @@ myInit(void)
return -1;
}
# if HAVE_LINUX_KVM_H
# include <linux/kvm.h>
static bool
virHostdevHostSupportsPassthroughKVM(void)
{
int kvmfd = -1;
bool ret = false;
if ((kvmfd = open("/dev/kvm", O_RDONLY)) < 0)
goto cleanup;
# ifdef KVM_CAP_IOMMU
if ((ioctl(kvmfd, KVM_CHECK_EXTENSION, KVM_CAP_IOMMU)) <= 0)
goto cleanup;
ret = true;
# endif
cleanup:
VIR_FORCE_CLOSE(kvmfd);
return ret;
}
# else
static bool
virHostdevHostSupportsPassthroughKVM(void)
{
return false;
}
# endif
static int
testVirHostdevPreparePCIHostdevs_unmanaged(void)
{
@ -483,12 +452,10 @@ testVirHostdevRoundtripUnmanaged(const void *opaque ATTRIBUTE_UNUSED)
if (testVirHostdevDetachPCINodeDevice() < 0)
goto out;
if (virHostdevHostSupportsPassthroughKVM()) {
if (testVirHostdevPreparePCIHostdevs_unmanaged() < 0)
goto out;
if (testVirHostdevReAttachPCIHostdevs_unmanaged() < 0)
goto out;
}
if (testVirHostdevPreparePCIHostdevs_unmanaged() < 0)
goto out;
if (testVirHostdevReAttachPCIHostdevs_unmanaged() < 0)
goto out;
if (testVirHostdevReAttachPCINodeDevice() < 0)
goto out;
@ -512,12 +479,10 @@ testVirHostdevRoundtripManaged(const void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
if (virHostdevHostSupportsPassthroughKVM()) {
if (testVirHostdevPreparePCIHostdevs_managed(false) < 0)
goto out;
if (testVirHostdevReAttachPCIHostdevs_managed(false) < 0)
goto out;
}
if (testVirHostdevPreparePCIHostdevs_managed(false) < 0)
goto out;
if (testVirHostdevReAttachPCIHostdevs_managed(false) < 0)
goto out;
ret = 0;
@ -544,12 +509,10 @@ testVirHostdevRoundtripMixed(const void *opaque ATTRIBUTE_UNUSED)
if (testVirHostdevDetachPCINodeDevice() < 0)
goto out;
if (virHostdevHostSupportsPassthroughKVM()) {
if (testVirHostdevPreparePCIHostdevs_managed(true) < 0)
goto out;
if (testVirHostdevReAttachPCIHostdevs_managed(true) < 0)
goto out;
}
if (testVirHostdevPreparePCIHostdevs_managed(true) < 0)
goto out;
if (testVirHostdevReAttachPCIHostdevs_managed(true) < 0)
goto out;
if (testVirHostdevReAttachPCINodeDevice() < 0)
goto out;