Changeset 62994 in vbox for trunk/src/VBox/Devices/Misc

Timestamp:

Aug 4, 2016 3:15:14 PM (9 years ago)

Author:

vboxsync

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

109603

Message:

Devices: warnings

File:

• trunk/src/VBox/Devices/Misc/VirtualKD.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Misc/VirtualKD.cpp

@@ -23 +23 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#define LOG_GROUP LOG_GROUP_DEV_VIRTUALKD
+#define LOG_GROUP LOG_GROUP_DEV // LOG_GROUP_DEV_VIRTUALKD
 #include <VBox/vmm/pdmdev.h>
+#include <VBox/log.h>
 #include <iprt/assert.h>
 #include <iprt/path.h>
@@ -83 +84 @@
 static DECLCALLBACK(int) vkdPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
+    RT_NOREF(pvUser, Port, cb);
     VIRTUALKD *pThis = PDMINS_2_DATA(pDevIns, VIRTUALKD *);
 
@@ -92 +94 @@
     }
     else
-        *pu32 = -1;
+        *pu32 = UINT32_MAX;
 
     return VINF_SUCCESS;
@@ -99 +101 @@
 static DECLCALLBACK(int) vkdPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
+    RT_NOREF(pvUser, cb);
     VIRTUALKD *pThis = PDMINS_2_DATA(pDevIns, VIRTUALKD *);
 
@@ -147 +150 @@
 
 /**
+ * @interface_method_impl{PDMDEVREG,pfnDestruct}
+ */
+static DECLCALLBACK(int) vkdDestruct(PPDMDEVINS pDevIns)
+{
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
+    VIRTUALKD *pThis = PDMINS_2_DATA(pDevIns, VIRTUALKD *);
+
+    delete pThis->pKDClient;
+    if (pThis->hLib != NIL_RTLDRMOD)
+        RTLdrClose(pThis->hLib);
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
 static DECLCALLBACK(int) vkdConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF(iInstance);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     VIRTUALKD *pThis = PDMINS_2_DATA(pDevIns, VIRTUALKD *);
 
@@ -168 +189 @@
     CFGMR3QueryString(pCfg, "Path", szPath, sizeof(szPath));
 
-    RTPathAppend(szPath, sizeof(szPath),
-#if HC_ARCH_BITS == 64
-        "kdclient64.dll"
-#else
-        "kdclient.dll"
-#endif
-        );
+    RTPathAppend(szPath, sizeof(szPath), HC_ARCH_BITS == 64 ?  "kdclient64.dll" : "kdclient.dll");
     int rc = RTLdrLoad(szPath, &pThis->hLib);
     if (RT_FAILURE(rc))
@@ -209 +224 @@
 }
 
-/**
- * @interface_method_impl{PDMDEVREG,pfnDestruct}
- */
-static DECLCALLBACK(int) vkdDestruct(PPDMDEVINS pDevIns)
-{
-    VIRTUALKD *pThis = PDMINS_2_DATA(pDevIns, VIRTUALKD *);
-
-    delete pThis->pKDClient;
-    if (pThis->hLib != NIL_RTLDRMOD)
-        RTLdrClose(pThis->hLib);
-
-    return VINF_SUCCESS;
-}
 
 /**
@@ -277 +279 @@
     PDM_DEVREG_VERSION
 };
+