Changeset 1624 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 22, 2007 12:48:54 PM (18 years ago)

Author:

vboxsync

Message:

added BackdoorLogDisabled config option to VMMDev

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VBoxDev.cpp (modified) (3 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -269 +269 @@
 static DECLCALLBACK(int) vmmdevBackdoorLog(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
-    if (cb == 1 && Port == RTLOG_DEBUG_PORT)
-    {
-        VMMDevState *pData = PDMINS2DATA(pDevIns, VMMDevState *);
+    VMMDevState *pData = PDMINS2DATA(pDevIns, VMMDevState *);
+
+    if (!pData->fBackdoorLogDisabled && cb == 1 && Port == RTLOG_DEBUG_PORT)
+    {
 
         /* The raw version. */
@@ -1586 +1587 @@
      * Validate and read the configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "GetHostTimeDisabled\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "GetHostTimeDisabled\0BackdoorLogDisabled\0"))
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
 
@@ -1593 +1594 @@
         pData->fGetHostTimeDisabled = false;
     else if (VBOX_FAILURE(rc))
-        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                   N_("Configuration error: Failed querying \"GetHostTimeDisabled\" as a boolean. (%Vrc)"),
-                                   rc);
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"GetHostTimeDisabled\" as a boolean"));
+
+    rc = CFGMR3QueryBool(pCfgHandle, "BackdoorLogDisabled", &pData->fBackdoorLogDisabled);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        pData->fBackdoorLogDisabled = false;
+    else if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"BackdoorLogDisabled\" as a boolean"));
 
     /*

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -132 +132 @@
     /** Set if GetHostTime should fail. 
      * Loaded from the GetHostTimeDisabled configuration value. */
-    bool fGetHostTimeDisabled; 
+    bool fGetHostTimeDisabled;
+
+    /** Set if backdoor logging should be disabled (output will be ignored then) */
+    bool fBackdoorLogDisabled;
 
 } VMMDevState;