Changeset 1738 in vbox

Timestamp:

Mar 27, 2007 4:16:11 PM (18 years ago)

Author:

vboxsync

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

19899

Message:

Clean up properly.

File:

• trunk/src/VBox/Devices/Serial/DevSerial.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -418 +418 @@
     int          rc = VINF_SUCCESS;
 
-    if (cb == 1)
+    if (cb == 1) 
     {
         rc = PDMCritSectEnter(&pData->CritSect, VINF_IOM_HC_IOPORT_WRITE);
@@ -428 +428 @@
         }
     }
-    else
+    else 
         AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
 
@@ -451 +451 @@
     int          rc = VINF_SUCCESS;
 
-    if (cb == 1)
+    if (cb == 1) 
     {
         rc = PDMCritSectEnter(&pData->CritSect, VINF_IOM_HC_IOPORT_READ);
@@ -462 +462 @@
         }
     }
-    else
+    else 
         rc = VERR_IOM_IOPORT_UNUSED;
 
@@ -512 +512 @@
     SerialState *pData = PDMINS2DATA(pDevIns, SerialState *);
 
-    if (u32Version != SERIAL_SAVED_STATE_VERSION)
+    if (u32Version != SERIAL_SAVED_STATE_VERSION) 
     {
         AssertMsgFailed(("u32Version=%d\n", u32Version));
@@ -535 +535 @@
         return rc;
 
-    if (u32 != ~0U)
+    if (u32 != ~0U) 
     {
         AssertMsgFailed(("u32=%#x expected ~0\n", u32));
@@ -603 +603 @@
             return NULL;
     }
+}
+
+/**
+ * Destruct a device instance.
+ *
+ * Most VM resources are freed by the VM. This callback is provided so that any non-VM
+ * resources can be freed correctly.
+ *
+ * @returns VBox status.
+ * @param   pDevIns     The device instance data.
+ */
+static DECLCALLBACK(int) serialDestruct(PPDMDEVINS pDevIns)
+{
+    SerialState *pData = PDMINS2DATA(pDevIns, SerialState *);
+
+    RTSemEventDestroy(pData->ReceiveSem);
+    pData->ReceiveSem = NIL_RTSEMEVENT;
+
+    PDMR3CritSectDelete(&pData->CritSect);
+    return VINF_SUCCESS;
 }
 
@@ -636 +656 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "IRQ\0IOBase\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "IRQ\0IOBase\0")) 
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
 
@@ -676 +696 @@
  * and CFGR3AreValuesValid() like we're doing in the other devices.  */
     rc = CFGMR3QueryU8 (pCfgHandle, "IRQ", &irq_lvl);
-    if (VBOX_FAILURE (rc))
+    if (VBOX_FAILURE (rc)) 
         return rc;
 
     rc = CFGMR3QueryU16 (pCfgHandle, "IOBase", &io_base);
-    if (VBOX_FAILURE (rc))
+    if (VBOX_FAILURE (rc)) 
         return rc;
 
@@ -800 +820 @@
     serialConstruct,
     /* pfnDestruct */
-    NULL,
+    serialDestruct,
     /* pfnRelocate */
     serialRelocate,