儲存庫 vbox 的更動 17186

時間撮記:

2009-2-27 上午12:57:39 (16 年 以前)

作者:

vboxsync

訊息:

VBoxNetFlt: Fixed vboxNetFltOsInitInstance which had gotten out of sync.

位置:

trunk/src/VBox/HostDrivers/VBoxNetFlt

檔案:

• VBoxNetFltInternal.h (修改) (1 筆差異)
• darwin/VBoxNetFlt-darwin.cpp (修改) (1 筆差異)
• linux/VBoxNetFlt-linux.c (修改) (2 筆差異)
• solaris/VBoxNetFlt-solaris.c (修改) (4 筆差異)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -408 +408 @@
  * @return  IPRT status code.
  * @param   pThis           The new instance.
+ * @param   pvContext       The user supplied context in the static config only.
+ *                          NULL in the dynamic config.
  *
  * @remarks Owns no locks.
  */
-DECLHIDDEN(int) vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis
-#ifdef VBOXNETFLT_STATIC_CONFIG
-        , void * pContext
-#endif
-        );
+DECLHIDDEN(int) vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext);
 
 /**

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -1185 +1185 @@
 
 
-int  vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis)
-{
+int  vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
+{
+    NOREF(pvContext);
     return vboxNetFltDarwinAttachToInterface(pThis, false /* fRediscovery */);
 }

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -1144 +1144 @@
 
 
-int  vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis)
+int  vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {
     int err;
@@ -1157 +1157 @@
         return VERR_INTNET_FLT_IF_NOT_FOUND;
     }
+
     Log(("vboxNetFltOsInitInstance: this=%p: Notifier installed.\n", pThis));
+    NOREF(pvContext)
     return pThis->fDisconnectedFromHost ? VERR_INTNET_FLT_IF_FAILED : VINF_SUCCESS;
 }

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

@@ -128 +128 @@
  * OS specific hooks invoked from common VBoxNetFlt ring-0.
  */
+/** @todo r=bird: What are these doing here? */
 bool vboxNetFltPortOsIsPromiscuous(PVBOXNETFLTINS pThis);
 void vboxNetFltPortOsGetMacAddress(PVBOXNETFLTINS pThis, PRTMAC pMac);
@@ -135 +136 @@
 int vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis);
 void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis);
-int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis);
+int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext);
 int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis);
 
@@ -3090 +3091 @@
 
 
-int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis)
+int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {
     LogFlow((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p\n"));
@@ -3111 +3112 @@
         LogRel((DEVICE_NAME ":vboxNetFltOsInitInstance failed to create mutex. rc=%Rrc\n", rc));
 
+    NOREF(pvContext)
     return rc;
 }