git: 6338833c50a7 - stable/12 - Add MODULE_PNP_INFO() to vmci(4). This allows devd(8) to load the kernel module automatically when FreeBSD is running on VMware.

[Hiroki Sato]

The branch stable/12 has been updated by hrs:

URL: https://cgit.FreeBSD.org/src/commit/?id=6338833c50a7566d006b722c791a6a92071309b8

commit 6338833c50a7566d006b722c791a6a92071309b8
Author:     Hiroki Sato <hrs at FreeBSD.org>
AuthorDate: 2019-08-25 18:46:10 +0000
Commit:     Hiroki Sato <hrs at FreeBSD.org>
CommitDate: 2020-12-29 21:48:32 +0000

    Add MODULE_PNP_INFO() to vmci(4).  This allows devd(8) to load the
    kernel module automatically when FreeBSD is running on VMware.
    
    Reviewed by:            mp
    Differential Revision:  https://reviews.freebsd.org/D21182
    
    (cherry picked from commit 639eac208771e9eb3d1141882514be35377abeee)
---
 sys/dev/vmware/vmci/vmci.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/sys/dev/vmware/vmci/vmci.c b/sys/dev/vmware/vmci/vmci.c
index dc029419e20d..82e23daa4c71 100644
--- a/sys/dev/vmware/vmci/vmci.c
+++ b/sys/dev/vmware/vmci/vmci.c
@@ -73,6 +73,16 @@ static driver_t vmci_driver = {
 static devclass_t vmci_devclass;
 DRIVER_MODULE(vmci, pci, vmci_driver, vmci_devclass, 0, 0);
 MODULE_VERSION(vmci, VMCI_VERSION);
+const struct {
+	uint16_t vendor;
+	uint16_t device;
+	const char *desc;
+} vmci_ids[] = {
+	{ VMCI_VMWARE_VENDOR_ID, VMCI_VMWARE_DEVICE_ID,
+	    "VMware Virtual Machine Communication Interface" },
+};
+MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, vmci, vmci_ids,
+    nitems(vmci_ids));
 
 MODULE_DEPEND(vmci, pci, 1, 1, 1);
 
@@ -112,10 +122,9 @@ static int
 vmci_probe(device_t dev)
 {
 
-	if (pci_get_vendor(dev) == VMCI_VMWARE_VENDOR_ID &&
-	    pci_get_device(dev) == VMCI_VMWARE_DEVICE_ID) {
-		device_set_desc(dev,
-		    "VMware Virtual Machine Communication Interface");
+	if (pci_get_vendor(dev) == vmci_ids[0].vendor &&
+	    pci_get_device(dev) == vmci_ids[0].device) {
+		device_set_desc(dev, vmci_ids[0].desc);
 
 		return (BUS_PROBE_DEFAULT);
 	}