Changeset 41413 in vbox for trunk/src

Timestamp:

May 23, 2012 9:45:54 AM (13 years ago)

Author:

vboxsync

Message:

VMMDevTesting.cpp: Output to log and release log.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp (modified) (5 diffs)

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

@@ -38 +38 @@
 
 #ifndef VBOX_WITHOUT_TESTING_FEATURES
+
+#define VMMDEV_TESTING_OUTPUT(a) \
+    do \
+    { \
+        LogAlways(a);\
+        LogRel(a);\
+        RTPrintf a; \
+    } while (0)
 
 /**
@@ -165 +173 @@
                             {
                                 case VMMDEV_TESTING_CMD_INIT:
-                                    RTPrintf("testing: INIT '%.*s'\n", sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz);
+                                    VMMDEV_TESTING_OUTPUT(("testing: INIT '%.*s'\n",
+                                                           sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz));
                                     break;
                                 case VMMDEV_TESTING_CMD_SUB_NEW:
-                                    RTPrintf("testing: SUB_NEW  '%.*s'\n", sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz);
+                                    VMMDEV_TESTING_OUTPUT(("testing: SUB_NEW  '%.*s'\n",
+                                                           sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz));
                                     break;
                                 case VMMDEV_TESTING_CMD_FAILED:
-                                    RTPrintf("testing: FAILED '%.*s'\n", sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz);
+                                    VMMDEV_TESTING_OUTPUT(("testing: FAILED '%.*s'\n",
+                                                           sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz));
                                     break;
                             }
@@ -190 +201 @@
                         pThis->TestingData.Error.c = u32;
                         if (uCmd == VMMDEV_TESTING_CMD_TERM)
-                            RTPrintf("testing: TERM - %u errors\n", u32);
-                        else
-                            RTPrintf("testing: SUB_DONE - %u errors\n", u32);
+                            VMMDEV_TESTING_OUTPUT(("testing: TERM - %u errors\n", u32));
+                        else
+                            VMMDEV_TESTING_OUTPUT(("testing: SUB_DONE - %u errors\n", u32));
                         return VINF_SUCCESS;
 #else
@@ -226 +237 @@
                         {
 #ifdef IN_RING3
-                            RTPrintf("testing: VALUE '%.*s'%*s: %'9llu (%#llx) [%u]\n",
-                                     sizeof(pThis->TestingData.Value.szName) - 1, pThis->TestingData.Value.szName,
-                                     off - 12 > 48 ? 0 : 48 - (off - 12), "",
-                                     pThis->TestingData.Value.u64Value.u, pThis->TestingData.Value.u64Value.u,
-                                     pThis->TestingData.Value.u32Unit);
+                            VMMDEV_TESTING_OUTPUT(("testing: VALUE '%.*s'%*s: %'9llu (%#llx) [%u]\n",
+                                                   sizeof(pThis->TestingData.Value.szName) - 1, pThis->TestingData.Value.szName,
+                                                   off - 12 > 48 ? 0 : 48 - (off - 12), "",
+                                                   pThis->TestingData.Value.u64Value.u, pThis->TestingData.Value.u64Value.u,
+                                                   pThis->TestingData.Value.u32Unit));
 #else
                             return VINF_IOM_R3_IOPORT_WRITE;
@@ -240 +251 @@
                         pThis->TestingData.Error.c = u32;
                         if (uCmd == VMMDEV_TESTING_CMD_TERM)
-                            RTPrintf("testing: TERM - %u errors\n", u32);
-                        else
-                            RTPrintf("testing: SUB_DONE - %u errors\n", u32);
+                            VMMDEV_TESTING_OUTPUT(("testing: TERM - %u errors\n", u32));
+                        else
+                            VMMDEV_TESTING_OUTPUT(("testing: SUB_DONE - %u errors\n", u32));
                         return VINF_SUCCESS;
 #else