Changeset 51658 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 19, 2014 3:25:54 AM (10 years ago)

Author:

vboxsync

Message:

VMM/GIM: Bits, try to find out why it breaks on mac2-rel.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/EMAll.cpp (modified) (1 diff)
• VMMAll/GIMAllHv.cpp (modified) (1 diff)
• VMMR3/GIMHv.cpp (modified) (1 diff)
• include/GIMHvInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp

@@ -79 +79 @@
         case MSR_GIM_HV_TIME_REF_COUNT:
         {
+            /** @todo r=ramshankar: Shouldn't we add the TSC offset here? */
             /* Hyper-V reports the time in 100 ns units (10 MHz). */
             uint64_t u64Tsc      = TMCpuTickGet(pVCpu);

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -474 +474 @@
         uint64_t const u64TscKHz = TMCpuTicksPerSecond(pVM) / UINT64_C(1000);
         pRefTsc->u32TscSequence  = 1;
-        pRefTsc->u64TscScale     = (((uint64_t)(10000) << 32) / u64TscKHz) << 32;
+        pRefTsc->u64TscScale     = UINT64_C(10000) << 32;
+        pRefTsc->u64TscScale    /= (u64TscKHz << 32);
 
         LogRel(("GIM: HyperV: Enabled TSC page at %#RGp (u64TscScale=%#RX64 u64TscKHz=%#RX64)\n", GCPhysTscPage,

trunk/src/VBox/VMM/include/GIMHvInternal.h

@@ -425 +425 @@
 /**
  * MMIO2 region indices.
+ * Note!! Saved-state are dependent on the index values, do -not- change!
  */
 /** The hypercall page region. */