Changeset 70095 in vbox

Timestamp:

Dec 12, 2017 6:32:35 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuest: More host options.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-linux.c (modified) (1 diff)
• VBoxGuest.cpp (modified) (1 diff)
• freebsd/Makefile (modified) (1 diff)
• freebsd/files_vboxguest (modified) (1 diff)
• linux/Makefile (modified) (1 diff)
• linux/files_vboxguest (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -1151 +1151 @@
 static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
 {
-    if (    pszValue == NULL
-        || *pszValue == '\0'
-        || *pszValue == 'n'
-        || *pszValue == 'N'
-        || *pszValue == 'd'
-        || *pszValue == 'D'
-        || (   (*pszValue == 'o' || *pszValue == 'O')
-            && (*pszValue == 'f' || *pszValue == 'F') )
-       )
-        g_DevExt.fLoggingEnabled = false;
-    else
-        g_DevExt.fLoggingEnabled = true;
+    g_DevExt.fLoggingEnabled = VBDrvCommonIsOptionValueTrue(pszValue);
     return 0;
 }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -1182 +1182 @@
     Log(("VGDrvCommonProcessOption: pszName='%s' pszValue='%s'\n", pszName, pszValue));
 
-    if (   strcmp(pszName, "r3_log_to_host") == 0
-        || strcmp(pszName, "LoggingEnabled") == 0 /*legacy*/ )
+    if (   RTStrICmpAscii(pszName, "r3_log_to_host") == 0
+        || RTStrICmpAscii(pszName, "LoggingEnabled") == 0 /*legacy*/ )
         pDevExt->fLoggingEnabled = VBDrvCommonIsOptionValueTrue(pszValue);
-    else if (VGDrvNativeProcessOption(pDevExt, pszName, pszValue))
+    else if (   RTStrNICmp(pszName, RT_STR_TUPLE("log")) == 0
+             || RTStrNICmpAscii(pszName, RT_STR_TUPLE("dbg_log")) == 0)
+    {
+        bool const  fLogRel    = *pszName == 'd' || *pszName == 'D';
+        const char *pszSubName = &pszName[fLogRel ? 4 + 3 : 3];
+        if (   !*pszSubName
+            || RTStrICmpAscii(pszSubName, "_flags") == 0
+            || RTStrICmpAscii(pszSubName, "_dest") == 0)
+        {
+            PRTLOGGER pLogger = fLogRel ? RTLogRelGetDefaultInstance() : RTLogDefaultInstance();
+            if (pLogger)
+            {
+                if (!*pszSubName)
+                    RTLogGroupSettings(pLogger, pszValue);
+                else if (RTStrICmpAscii(pszSubName, "_flags"))
+                    RTLogFlags(pLogger, pszValue);
+                else
+                    RTLogDestinations(pLogger, pszValue);
+            }
+        }
+        else if (!VGDrvNativeProcessOption(pDevExt, pszName, pszValue))
+            LogRel(("VBoxGuest: Ignoring unknown option '%s' (value '%s')\n", pszName, pszValue));
+    }
+    else if (!VGDrvNativeProcessOption(pDevExt, pszName, pszValue))
         LogRel(("VBoxGuest: Ignoring unknown option '%s' (value '%s')\n", pszName, pszValue));
 }

trunk/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile

@@ -89 +89 @@
         RTStrCopyEx.c \
         RTStrCopyP.c \
+        RTStrICmpAscii.c \
+        RTStrNICmpAscii.c \
         strformat.c \
         strformatnum.c \

trunk/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest

@@ -124 +124 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyEx.cpp=>common/string/RTStrCopyEx.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyP.cpp=>common/string/RTStrCopyP.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrICmpAscii.cpp=>common/string/RTStrICmpAscii.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNICmpAscii.cpp=>common/string/RTStrNICmpAscii.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatnum.cpp=>common/string/strformatnum.c \

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

@@ -86 +86 @@
         common/string/RTStrCopyEx.o \
         common/string/RTStrCopyP.o \
+        common/string/RTStrICmpAscii.o \
+        common/string/RTStrNICmpAscii.o \
         common/string/strformat.o \
         common/string/strformatnum.o \

trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

@@ -139 +139 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyEx.cpp=>common/string/RTStrCopyEx.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyP.cpp=>common/string/RTStrCopyP.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrICmpAscii.cpp=>common/string/RTStrICmpAscii.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNICmpAscii.cpp=>common/string/RTStrNICmpAscii.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatnum.cpp=>common/string/strformatnum.c \