[PATCH 3/4 v2] VFIO: pci: amend vfio-pci for explicit binding via sysfsonly

[Kim Phillips]

Force the vfio-pci driver to only be bound explicitly via sysfs to avoid
conflics with other drivers in the event of a hotplug.  Also replace
the only dynamic ids assignment with a table with a single PCI_ANY_ID
entry since writing the sysfs bind file without having to specify ids
via the new_id file first should no longer be necessary.

Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxx>
---
 drivers/vfio/pci/vfio_pci.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 6ab71b9..c5b434f 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -895,12 +895,22 @@ static struct pci_error_handlers vfio_err_handlers = {
 	.error_detected = vfio_pci_aer_err_detected,
 };
 
+static DEFINE_PCI_DEVICE_TABLE(vfio_pci_id_table) = {
+        { PCI_DEVICE(PCI_ANY_ID, PCI_ANY_ID) },
+        { 0 }
+};
+
+MODULE_DEVICE_TABLE(pci, vfio_pci_id_table);
+
 static struct pci_driver vfio_pci_driver = {
 	.name		= "vfio-pci",
-	.id_table	= NULL, /* only dynamic ids */
+	.id_table	= vfio_pci_id_table, /* no dynamic ids */
 	.probe		= vfio_pci_probe,
 	.remove		= vfio_pci_remove,
 	.err_handler	= &vfio_err_handlers,
+	.driver = {
+		.sysfs_bind_only = true, /* bind only via sysfs */
+	},
 };
 
 static void __exit vfio_pci_cleanup(void)
-- 
1.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/