Changeset 53568 in vbox for trunk/src/VBox

Timestamp:

Dec 18, 2014 9:09:54 PM (10 years ago)

Author:

vboxsync

Message:

SUPDrv.c: Disabled annoying assertion in i64TSCDelta init code.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• SUPDrv.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -672 +672 @@
         $(QUIET)$(RM) -f $@
         $(QUIET)$(SED) \
-                -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-                -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-                -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-                -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+                -e 's/@VBOX_VERSION_STRING@/$(if !defined(VBOX_MAVERICS_CODE_SIGNING_HACK),$(VBOX_VERSION_STRING),4.2.51)/g' \
+                -e 's/@VBOX_VERSION_MAJOR@/$(if  !defined(VBOX_MAVERICS_CODE_SIGNING_HACK),$(VBOX_VERSION_MAJOR),4)/g' \
+                -e 's/@VBOX_VERSION_MINOR@/$(if  !defined(VBOX_MAVERICS_CODE_SIGNING_HACK),$(VBOX_VERSION_MINOR),2)/g' \
+                -e 's/@VBOX_VERSION_BUILD@/$(if  !defined(VBOX_MAVERICS_CODE_SIGNING_HACK),$(VBOX_VERSION_BUILD),51)/g' \
                 -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
                 -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -6376 +6376 @@
                 else
                 {
+#if 0  /** @todo Hitting this on mac pro runing maverics. panicing on driver load is annoying.*/
                     for (iCpu = 0; iCpu < pGip->cCpus; iCpu++)
-                        Assert(!pGip->aCPUs[iCpu].i64TSCDelta);
+                        AssertMsg(!pGip->aCPUs[iCpu].i64TSCDelta, ("i=%u iCpu=%u %lld mode=%d\n", i, iCpu, pGip->aCPUs[iCpu].i64TSCDelta, pGip->enmMode);
+#endif
                 }
 #endif