Changeset 8715

Timestamp:

05/08/08 16:41:13 (2 months ago)

Author:

vboxsync

Message:

Fix using several NAT adapters in a single VM.

Files:

• trunk/include/VBox/pdmdrv.h (modified) (1 diff)
• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (1 diff)

trunk/include/VBox/pdmdrv.h

@@ -806 +806 @@
-#ifdef IN_RING3
-/**
+ * @copydoc PDMDRVHLP::pfnSSMRegister
+ */
+DECLINLINE(int) PDMDrvHlpSSMRegister(PPDMDRVINS pDrvIns, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
+                                     PFNSSMDRVSAVEPREP pfnSavePrep, PFNSSMDRVSAVEEXEC pfnSaveExec, PFNSSMDRVSAVEDONE pfnSaveDone,
+                                     PFNSSMDRVLOADPREP pfnLoadPrep, PFNSSMDRVLOADEXEC pfnLoadExec, PFNSSMDRVLOADDONE pfnLoadDone)
+{
+    return pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, pszName, u32Instance, u32Version, cbGuess,
+                                            pfnSavePrep, pfnSaveExec, pfnSaveDone,
+                                            pfnLoadPrep, pfnLoadExec, pfnLoadDone);
+}
+
+
+/**
- * @copydoc PDMDRVHLP::pfnSTAMRegister
- */

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -512 +512 @@
-                     * engine after we loaded a guest state.
-                     */
-pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, pDrvIns->pDrvReg->szDriverName, 0, 0
-            pDrvIns->iInstance, NULL, NULL, NULL, NULL, NULL
-           
+PDMDrvHlpSSMRegister(pDrvIns, pDrvIns->pDrvReg->szDriverName
+pDrvIns->iInstance, 0, 0
+NULL, NULL, NULL, NULL, NULL,
-                    AssertRC(rc2);
-                    pDrvIns->pDrvHlp->pfnPDMPollerRegister(pDrvIns, drvNATPoller);