Changeset 50664 in vbox for trunk/src/VBox/HostDrivers/Support/solaris

Timestamp:

Mar 3, 2014 10:54:25 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92595

Message:

Support,VBoxNet[Flt|Adp]/solaris: Fix S10 regression with trunk, ddi_quiesce_not_needed missing.

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (7 diffs)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -93 +93 @@
 static int VBoxDrvSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t Cmd);
 static int VBoxDrvSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t Cmd);
+static int VBoxDrvSolarisQuiesceNotNeeded(dev_info_t *pDip);
 
 static int VBoxSupDrvErr2SolarisErr(int rc);
@@ -108 +109 @@
     VBoxDrvSolarisOpen,
     VBoxDrvSolarisClose,
-    nodev,                  /* b strategy */
-    nodev,                  /* b dump */
-    nodev,                  /* b print */
+    nodev,                        /* b strategy */
+    nodev,                        /* b dump */
+    nodev,                        /* b print */
     VBoxDrvSolarisRead,
     VBoxDrvSolarisWrite,
     VBoxDrvSolarisIOCtl,
-    nodev,                  /* c devmap */
-    nodev,                  /* c mmap */
-    nodev,                  /* c segmap */
-    nochpoll,               /* c poll */
-    ddi_prop_op,            /* property ops */
-    NULL,                   /* streamtab  */
-    D_NEW | D_MP,          /* compat. flag */
-    CB_REV                  /* revision */
+    nodev,                        /* c devmap */
+    nodev,                        /* c mmap */
+    nodev,                        /* c segmap */
+    nochpoll,                     /* c poll */
+    ddi_prop_op,                  /* property ops */
+    NULL,                         /* streamtab  */
+    D_NEW | D_MP,                 /* compat. flag */
+    CB_REV                        /* revision */
 };
 
@@ -129 +130 @@
 static struct dev_ops g_VBoxDrvSolarisDevOps =
 {
-    DEVO_REV,               /* driver build revision */
-    0,                      /* ref count */
-    nulldev,                /* get info */
-    nulldev,                /* identify */
-    nulldev,                /* probe */
+    DEVO_REV,                     /* driver build revision */
+    0,                            /* ref count */
+    nulldev,                      /* get info */
+    nulldev,                      /* identify */
+    nulldev,                      /* probe */
     VBoxDrvSolarisAttach,
     VBoxDrvSolarisDetach,
-    nodev,                  /* reset */
+    nodev,                        /* reset */
     &g_VBoxDrvSolarisCbOps,
     (struct bus_ops *)0,
-    nodev,                  /* power */
-    ddi_quiesce_not_needed
+    nodev,                        /* power */
+    VBoxDrvSolarisQuiesceNotNeeded
 };
 
@@ -148 +149 @@
 static struct modldrv g_VBoxDrvSolarisModule =
 {
-    &mod_driverops,         /* extern from kernel */
+    &mod_driverops,               /* extern from kernel */
     DEVICE_DESC " " VBOX_VERSION_STRING "r" RT_XSTR(VBOX_SVN_REV),
     &g_VBoxDrvSolarisDevOps
@@ -161 +162 @@
     {
         &g_VBoxDrvSolarisModule,
-        NULL                     /* terminate array of linkage structures */
+        NULL                      /* terminate array of linkage structures */
     }
 };
@@ -178 +179 @@
 typedef struct
 {
-    dev_info_t     *pDip;   /* Device handle */
+    dev_info_t     *pDip;         /* Device handle */
 } vbox_devstate_t;
 #endif
@@ -442 +443 @@
 
 /**
+ * Quiesce not-needed entry point, as Solaris 10 doesn't have any
+ * ddi_quiesce_not_needed() function.
+ *
+ * @param   pDip            The module structure instance.
+ *
+ * @return  corresponding solaris error code.
+ */
+static int VBoxDrvSolarisQuiesceNotNeeded(dev_info_t *pDip)
+{
+    return DDI_SUCCESS;
+}
+
+
+/**
  * open() worker.
  */