Changeset 82138 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 23, 2019 11:42:19 PM (5 years ago)

Author:

vboxsync

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

134948

Message:

DevPCNet: Set up critsect correctly for ring-0/raw-mode too. bugref:9218

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (17 diffs)

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

@@ -4429 +4429 @@
  * @callback_method_impl{FNSSMDEVLIVEEXEC, Pass 0 only.}
  */
-static DECLCALLBACK(int) pcnetLiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
+static DECLCALLBACK(int) pcnetR3LiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
 {
     RT_NOREF(uPass);
@@ -4442 +4442 @@
  *      Serializes the receive thread, it may be working inside the critsect.}
  */
-static DECLCALLBACK(int) pcnetSavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) pcnetR3SavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     RT_NOREF(pSSM);
@@ -4458 +4458 @@
  * @callback_method_impl{FNSSMDEVSAVEEXEC}
  */
-static DECLCALLBACK(int) pcnetSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) pcnetR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     PPCNETSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
@@ -4495 +4495 @@
  *      Serializes the receive thread, it may be working inside the critsect.}
  */
-static DECLCALLBACK(int) pcnetLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) pcnetR3LoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     PPCNETSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
@@ -4525 +4525 @@
  * @callback_method_impl{FNSSMDEVLOADEXEC}
  */
-static DECLCALLBACK(int) pcnetLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
+static DECLCALLBACK(int) pcnetR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     PPCNETSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
@@ -4629 +4629 @@
  * @callback_method_impl{FNSSMDEVLOADDONE}
  */
-static DECLCALLBACK(int) pcnetLoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) pcnetR3LoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     RT_NOREF(pSSM);
@@ -4911 +4911 @@
  * @interface_method_impl{PDMDEVREG,pfnPowerOff}
  */
-static DECLCALLBACK(void) pcnetPowerOff(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) pcnetR3PowerOff(PPDMDEVINS pDevIns)
 {
     /* Poke thread waiting for buffer space. */
@@ -4923 +4923 @@
  * One port on the network card has been disconnected from the network.
  */
-static DECLCALLBACK(void) pcnetDetach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
+static DECLCALLBACK(void) pcnetR3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
     RT_NOREF(fFlags);
     PPCNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
-    Log(("#%d pcnetDetach:\n", PCNET_INST_NR));
+    Log(("#%d pcnetR3Detach:\n", PCNET_INST_NR));
 
     AssertLogRelReturnVoid(iLUN == 0);
@@ -4953 +4953 @@
  * One port on the network card has been connected to a network.
  */
-static DECLCALLBACK(int) pcnetAttach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
+static DECLCALLBACK(int) pcnetR3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
     RT_NOREF(fFlags);
     PPCNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
-    LogFlow(("#%d pcnetAttach:\n", PCNET_INST_NR));
+    LogFlow(("#%d pcnetR3Attach:\n", PCNET_INST_NR));
 
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
@@ -5000 +5000 @@
  * @interface_method_impl{PDMDEVREG,pfnSuspend}
  */
-static DECLCALLBACK(void) pcnetSuspend(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) pcnetR3Suspend(PPDMDEVINS pDevIns)
 {
     /* Poke thread waiting for buffer space. */
@@ -5010 +5010 @@
  * @interface_method_impl{PDMDEVREG,pfnReset}
  */
-static DECLCALLBACK(void) pcnetReset(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) pcnetR3Reset(PPDMDEVINS pDevIns)
 {
     PPCNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
@@ -5028 +5028 @@
  * @interface_method_impl{PDMDEVREG,pfnRelocate}
  */
-static DECLCALLBACK(void) pcnetRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+static DECLCALLBACK(void) pcnetR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
     RT_NOREF(offDelta);
@@ -5042 +5042 @@
  * @interface_method_impl{PDMDEVREG,pfnDestruct}
  */
-static DECLCALLBACK(int) pcnetDestruct(PPDMDEVINS pDevIns)
+static DECLCALLBACK(int) pcnetR3Destruct(PPDMDEVINS pDevIns)
 {
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
@@ -5063 +5063 @@
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int) pcnetConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
+static DECLCALLBACK(int) pcnetR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
@@ -5316 +5316 @@
 
     rc = PDMDevHlpSSMRegisterEx(pDevIns, PCNET_SAVEDSTATE_VERSION, sizeof(*pThis), NULL,
-                                NULL,          pcnetLiveExec, NULL,
-                                pcnetSavePrep, pcnetSaveExec, NULL,
-                                pcnetLoadPrep, pcnetLoadExec, pcnetLoadDone);
+                                NULL,            pcnetR3LiveExec, NULL,
+                                pcnetR3SavePrep, pcnetR3SaveExec, NULL,
+                                pcnetR3LoadPrep, pcnetR3LoadExec, pcnetR3LoadDone);
     AssertRCReturn(rc, rc);
 
@@ -5457 +5457 @@
 }
 
-#endif /* IN_RING3 */
+#else  /* !IN_RING3 */
+
+/**
+ * @callback_method_impl{PDMDEVREGR0,pfnConstruct}
+ */
+static DECLCALLBACK(int) pcnetRZConstruct(PPDMDEVINS pDevIns)
+{
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
+    PPCNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
+
+    int rc = PDMDevHlpSetDeviceCritSect(pDevIns, &pThis->CritSect);
+    AssertRCReturn(rc, rc);
+
+    return VINF_SUCCESS;
+}
+
+#endif /* !IN_RING3 */
 
 /**
@@ -5484 +5500 @@
     /* .pszRCMod = */               "VBoxDDRC.rc",
     /* .pszR0Mod = */               "VBoxDDR0.r0",
-    /* .pfnConstruct = */           pcnetConstruct,
-    /* .pfnDestruct = */            pcnetDestruct,
-    /* .pfnRelocate = */            pcnetRelocate,
+    /* .pfnConstruct = */           pcnetR3Construct,
+    /* .pfnDestruct = */            pcnetR3Destruct,
+    /* .pfnRelocate = */            pcnetR3Relocate,
     /* .pfnMemSetup = */            NULL,
     /* .pfnPowerOn = */             NULL,
-    /* .pfnReset = */               pcnetReset,
-    /* .pfnSuspend = */             pcnetSuspend,
+    /* .pfnReset = */               pcnetR3Reset,
+    /* .pfnSuspend = */             pcnetR3Suspend,
     /* .pfnResume = */              NULL,
-    /* .pfnAttach = */              pcnetAttach,
-    /* .pfnDetach = */              pcnetDetach,
+    /* .pfnAttach = */              pcnetR3Attach,
+    /* .pfnDetach = */              pcnetR3Detach,
     /* .pfnQueryInterface = */      NULL,
     /* .pfnInitComplete = */        NULL,
-    /* .pfnPowerOff = */            pcnetPowerOff,
+    /* .pfnPowerOff = */            pcnetR3PowerOff,
     /* .pfnSoftReset = */           NULL,
     /* .pfnReserved0 = */           NULL,