提交 b437b50b 编写于 作者: M Michal Privoznik

virpcitest: Use modern VFIO

The pci-stub is so old school that no one uses it. All modern
systems have adapted VFIO. Switch our virpcitest too.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Tested-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
上级 62c41913
...@@ -106,12 +106,12 @@ testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNUSED) ...@@ -106,12 +106,12 @@ testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNUSED)
if (!(dev[i] = virPCIDeviceNew(0, 0, i + 1, 0))) if (!(dev[i] = virPCIDeviceNew(0, 0, i + 1, 0)))
goto cleanup; goto cleanup;
virPCIDeviceSetStubDriver(dev[i], VIR_PCI_STUB_DRIVER_KVM); virPCIDeviceSetStubDriver(dev[i], VIR_PCI_STUB_DRIVER_VFIO);
if (virPCIDeviceDetach(dev[i], activeDevs, inactiveDevs) < 0) if (virPCIDeviceDetach(dev[i], activeDevs, inactiveDevs) < 0)
goto cleanup; goto cleanup;
if (testVirPCIDeviceCheckDriver(dev[i], "pci-stub") < 0) if (testVirPCIDeviceCheckDriver(dev[i], "vfio-pci") < 0)
goto cleanup; goto cleanup;
CHECK_LIST_COUNT(activeDevs, 0); CHECK_LIST_COUNT(activeDevs, 0);
...@@ -147,7 +147,7 @@ testVirPCIDeviceReset(const void *opaque ATTRIBUTE_UNUSED) ...@@ -147,7 +147,7 @@ testVirPCIDeviceReset(const void *opaque ATTRIBUTE_UNUSED)
if (!(dev[i] = virPCIDeviceNew(0, 0, i + 1, 0))) if (!(dev[i] = virPCIDeviceNew(0, 0, i + 1, 0)))
goto cleanup; goto cleanup;
virPCIDeviceSetStubDriver(dev[i], VIR_PCI_STUB_DRIVER_KVM); virPCIDeviceSetStubDriver(dev[i], VIR_PCI_STUB_DRIVER_VFIO);
if (virPCIDeviceReset(dev[i], activeDevs, inactiveDevs) < 0) if (virPCIDeviceReset(dev[i], activeDevs, inactiveDevs) < 0)
goto cleanup; goto cleanup;
...@@ -187,7 +187,7 @@ testVirPCIDeviceReattach(const void *opaque ATTRIBUTE_UNUSED) ...@@ -187,7 +187,7 @@ testVirPCIDeviceReattach(const void *opaque ATTRIBUTE_UNUSED)
CHECK_LIST_COUNT(activeDevs, 0); CHECK_LIST_COUNT(activeDevs, 0);
CHECK_LIST_COUNT(inactiveDevs, i + 1); CHECK_LIST_COUNT(inactiveDevs, i + 1);
virPCIDeviceSetStubDriver(dev[i], VIR_PCI_STUB_DRIVER_KVM); virPCIDeviceSetStubDriver(dev[i], VIR_PCI_STUB_DRIVER_VFIO);
} }
CHECK_LIST_COUNT(activeDevs, 0); CHECK_LIST_COUNT(activeDevs, 0);
...@@ -245,7 +245,7 @@ testVirPCIDeviceDetachSingle(const void *opaque) ...@@ -245,7 +245,7 @@ testVirPCIDeviceDetachSingle(const void *opaque)
if (!dev) if (!dev)
goto cleanup; goto cleanup;
virPCIDeviceSetStubDriver(dev, VIR_PCI_STUB_DRIVER_KVM); virPCIDeviceSetStubDriver(dev, VIR_PCI_STUB_DRIVER_VFIO);
if (virPCIDeviceDetach(dev, NULL, NULL) < 0) if (virPCIDeviceDetach(dev, NULL, NULL) < 0)
goto cleanup; goto cleanup;
...@@ -405,7 +405,7 @@ mymain(void) ...@@ -405,7 +405,7 @@ mymain(void)
/* Detach an unbound device */ /* Detach an unbound device */
DO_TEST_PCI_DRIVER(0, 0x0a, 2, 0, NULL); DO_TEST_PCI_DRIVER(0, 0x0a, 2, 0, NULL);
DO_TEST_PCI(testVirPCIDeviceDetachSingle, 0, 0x0a, 2, 0); DO_TEST_PCI(testVirPCIDeviceDetachSingle, 0, 0x0a, 2, 0);
DO_TEST_PCI_DRIVER(0, 0x0a, 2, 0, "pci-stub"); DO_TEST_PCI_DRIVER(0, 0x0a, 2, 0, "vfio-pci");
/* Reattach an unknown unbound device */ /* Reattach an unknown unbound device */
DO_TEST_PCI_DRIVER(0, 0x0a, 3, 0, NULL); DO_TEST_PCI_DRIVER(0, 0x0a, 3, 0, NULL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册