提交 39d4f78a 编写于 作者: D Daniel Henrique Barboza 提交者: Michal Privoznik

tests/virhostdevtest: remove virHostdevHostSupportsPassthroughKVM

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: NMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
上级 f0f1e79b
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册