Changeset 9903 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Jun 25, 2008 10:59:21 AM (17 years ago)

Author:

vboxsync

Message:

vboxadd linux additions kernel module: properly register a misc device if the device major was not specified (as by default) -- fixes udev integration

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -72 +72 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <linux/miscdevice.h>
 
 #define xstr(s) str(s)
@@ -613 +614 @@
 };
 
+static struct miscdevice gMiscDevice =
+{
+    minor:      MISC_DYNAMIC_MINOR,
+    name:       "vboxadd",
+    fops:       &vbox_fops
+};
+
 #ifndef IRQ_RETVAL
 /* interrupt handlers in 2.4 kernels don't return anything */
@@ -882 +890 @@
             VBOX_VERSION_STRING));
     /* register a character device */
-    err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
-    if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
-    {
-        LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
-                     vbox_major, err));
-        PCI_DEV_PUT(pcidev);
-        return -ENODEV;
-    }
-    /* if no major code was set, take the return value */
-    if (!vbox_major)
-        vbox_major = err;
+    if (vbox_major > 0)
+    {
+        err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
+        if (err < 0 || (vbox_major & err) || (!vbox_major && !err))
+        {
+            LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
+                        vbox_major, err));
+            PCI_DEV_PUT(pcidev);
+            return -ENODEV;
+        }
+        /* if no major code was set, take the return value */
+        if (!vbox_major)
+            vbox_major = err;
+    }
+    else
+    {
+        err = misc_register(&gMiscDevice);
+        if (err)
+        {
+            LogRelFunc(("misc_register failed (rc=%d)\n", err));
+            return -ENODEV;
+        }
+    }
 
     /* allocate and initialize device extension */