Changeset 37766 in vbox for trunk

Timestamp:

Jul 4, 2011 2:15:25 PM (13 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetBow: don't create device nodes, some renaming.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris

Files:

• VBoxNetFltBow-solaris.c (modified) (5 diffs)
• vboxbow.conf (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c

@@ -62 +62 @@
 *******************************************************************************/
 /** The module name. */
-#define DEVICE_NAME                     "vboxflt"
+#define DEVICE_NAME                     "vboxbow"
 /** The module descriptions as seen in 'modinfo'. */
 #define DEVICE_DESC_DRV                 "VirtualBox NetBow"
 /** The dynamically created VNIC name (hardcoded in NetIf-solaris.cpp).
  *  @todo move this define into a common header. */
-#define VBOXFLT_VNIC_NAME               "vboxvnic"
+#define VBOXBOW_VNIC_NAME               "vboxvnic"
 /** The VirtualBox VNIC template name (hardcoded in NetIf-solaris.cpp).
  *   *  @todo move this define into a common header. */
-#define VBOXFLT_VNIC_TEMPLATE_NAME      "vboxvnic_template"
+#define VBOXBOW_VNIC_TEMPLATE_NAME      "vboxvnic_template"
 /** Debugging switch for using symbols in kmdb */
 # define LOCAL                          static
@@ -382 +382 @@
         case DDI_ATTACH:
         {
-            int instance = ddi_get_instance(pDip);
-            int rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0, "none", "none", 0666);
-            if (rc == DDI_SUCCESS)
-            {
-                g_pVBoxNetFltSolarisDip = pDip;
-                ddi_report_dev(pDip);
-                return DDI_SUCCESS;
-            }
-            else
-                LogRel((DEVICE_NAME ":VBoxNetFltSolarisAttach failed to create minor node. rc=%d\n", rc));
-            return DDI_FAILURE;
+            g_pVBoxNetFltSolarisDip = pDip;
+            return DDI_SUCCESS;
         }
 
@@ -424 +415 @@
         case DDI_DETACH:
         {
-            ddi_remove_minor_node(pDip, NULL);
             return DDI_SUCCESS;
         }
@@ -1075 +1065 @@
         return VERR_NO_MEMORY;
 
-    RTStrPrintf(pVNIC->szName, sizeof(pVNIC->szName), "%s%RU64", VBOXFLT_VNIC_NAME, pThis->u.s.uInstance);
+    RTStrPrintf(pVNIC->szName, sizeof(pVNIC->szName), "%s%RU64", VBOXBOW_VNIC_NAME, pThis->u.s.uInstance);
 
     /*
@@ -1297 +1287 @@
         {
             pThis->u.s.fIsVNIC = true;
-            if (RTStrNCmp(pThis->szName, VBOXFLT_VNIC_TEMPLATE_NAME, sizeof(VBOXFLT_VNIC_TEMPLATE_NAME) - 1) == 0)
+            if (RTStrNCmp(pThis->szName, VBOXBOW_VNIC_TEMPLATE_NAME, sizeof(VBOXBOW_VNIC_TEMPLATE_NAME) - 1) == 0)
             {
                 LogFlow((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p VNIC template '%s' detected.\n", pThis, pThis->szName));

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxbow.conf

@@ -1 +1 @@
 #
-# Solaris Host VBoxFlt (Crossbow) Configuration
+# Solaris Host VBoxBow (Crossbow) Configuration
 #
 # Copyright (C) 2008-2010 Oracle Corporation