Changeset 69983 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Dec 7, 2017 2:55:58 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuest-netbsd.c: call config_init_component() for MODULE_CMD_INIT
instead of doing the same thing manually. Ditto for fini.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -142 +142 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+extern struct cfdriver vboxguest_cd; /* CFDRIVER_DECL */
+extern struct cfattach vboxguest_ca; /* CFATTACH_DECL */
+
 /*
  * The /dev/vboxguest character device entry points.
@@ -177 +180 @@
 /** selinfo structure used for polling. */
 static struct selinfo       g_SelInfo;
-
-CFDRIVER_DECL(vboxguest, DV_DULL, NULL);
-extern struct cfdriver vboxguest_cd;
 
 
@@ -693 +693 @@
 MODULE(MODULE_CLASS_DRIVER, vboxguest, "pci");
 
-static int loc[2] = {-1, -1};
+CFDRIVER_DECL(vboxguest, DV_DULL, NULL);
+
+static struct cfdriver * const cfdriver_ioconf_vboxguest[] = {
+    &vboxguest_cd, NULL
+};
+
+static int loc[2] = { -1, -1 };
 
 static const struct cfparent pspec = {
@@ -699 +705 @@
 };
 
-static struct cfdata vboxguest_cfdata[] = {
+/*  vboxguest0 at pci? dev ? function ? */
+static struct cfdata cfdata_ioconf_vboxguest[] = {
     {
         .cf_name = "vboxguest",
         .cf_atname = "vboxguest",
         .cf_unit = 0,           /* Only unit 0 is ever used  */
-        .cf_fstate = FSTATE_STAR,
+        .cf_fstate = FSTATE_NOTFOUND,
         .cf_loc = loc,
         .cf_flags = 0,
@@ -712 +719 @@
 };
 
+static struct cfattach * const vboxguest_cfattachinit[] = {
+        &vboxguest_ca, NULL
+};
+
+static const struct cfattachinit cfattach_ioconf_vboxguest[] = {
+        { "vboxguest", vboxguest_cfattachinit },
+        { NULL, NULL }
+};
+
 static int
 vboxguest_modcmd(modcmd_t cmd, void *opaque)
 {
     devmajor_t bmajor, cmajor;
+    register_t retval;
     int error;
-    register_t retval;
 
     LogFlow((DEVICE_NAME ": %s\n", __func__));
 
-    bmajor = cmajor = NODEVMAJOR;
     switch (cmd)
     {
         case MODULE_CMD_INIT:
-            error = config_cfdriver_attach(&vboxguest_cd);
+            error = config_init_component(cfdriver_ioconf_vboxguest,
+                                          cfattach_ioconf_vboxguest,
+                                          cfdata_ioconf_vboxguest);
+            if (error)
+                break;
+
+            bmajor = cmajor = NODEVMAJOR;
+            error = devsw_attach("vboxguest",
+                                 NULL, &bmajor,
+                                 &g_VBoxGuestNetBSDChrDevSW, &cmajor);
             if (error)
             {
-                printf("config_cfdriver_attach failed: %d", error);
-                break;
+                if (error == EEXIST)
+                    error = 0; /* maybe built-in ... improve eventually */
+                else
+                    break;
             }
-            error = config_cfattach_attach(vboxguest_cd.cd_name, &vboxguest_ca);
-            if (error)
-            {
-                config_cfdriver_detach(&vboxguest_cd);
-                printf("%s: unable to register cfattach\n", vboxguest_cd.cd_name);
-                break;
-            }
-            error = config_cfdata_attach(vboxguest_cfdata, 1);
-            if (error)
-            {
-                printf("%s: unable to attach cfdata\n", vboxguest_cd.cd_name);
-                config_cfattach_detach(vboxguest_cd.cd_name, &vboxguest_ca);
-                config_cfdriver_detach(&vboxguest_cd);
-                break;
-            }
-
-            error = devsw_attach("vboxguest", NULL, &bmajor, &g_VBoxGuestNetBSDChrDevSW, &cmajor);
-
-            if (error == EEXIST)
-                error = 0; /* maybe built-in ... improve eventually */
-
-            if (error)
-                break;
-
-            error = do_sys_mknod(curlwp, "/dev/vboxguest", 0666|S_IFCHR, makedev(cmajor, 0), &retval, UIO_SYSSPACE);
+
+            error = do_sys_mknod(curlwp, "/dev/vboxguest",
+                                 0666|S_IFCHR, makedev(cmajor, 0),
+                                 &retval, UIO_SYSSPACE);
             if (error == EEXIST)
                 error = 0;
@@ -761 +766 @@
 
         case MODULE_CMD_FINI:
-            error = config_cfdata_detach(vboxguest_cfdata);
+            error = config_fini_component(cfdriver_ioconf_vboxguest,
+                                          cfattach_ioconf_vboxguest,
+                                          cfdata_ioconf_vboxguest);
             if (error)
                 break;
-            error = config_cfattach_detach(vboxguest_cd.cd_name, &vboxguest_ca);
-            if (error)
-                break;
-            config_cfdriver_detach(&vboxguest_cd);
-            error = devsw_detach(NULL, &g_VBoxGuestNetBSDChrDevSW);
+
+            devsw_detach(NULL, &g_VBoxGuestNetBSDChrDevSW);
             break;