Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 52008)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 52009)
@@ -1218,4 +1218,6 @@
             && fOsXGuest)
         {
+            /* When adding new OS X types, please add corresponding types to GIMOSID and
+               update GIMR3IsOSXGuest().  */
             GIMOSID enmOsId = GIMOSID_OSX;
             if (osTypeId == "MacOS_64")
Index: /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 52008)
+++ /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 52009)
@@ -5132,5 +5132,4 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestDB);
 
-
     /* This can be a fault-type #DB (instruction breakpoint) or a trap-type #DB (data breakpoint). However, for both cases
        DR6 and DR7 are updated to what the exception handler expects. See AMD spec. 15.12.2 "#DB (Debug)". */
Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 52008)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 52009)
@@ -6385,5 +6385,5 @@
      *
      * The present bit and the unusable bit has been observed to be set at the
-     * same time (the selector was supposed to invalid as we started executing
+     * same time (the selector was supposed to be invalid as we started executing
      * a V8086 interrupt in ring-0).
      *
Index: /trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp	(revision 52008)
+++ /trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp	(revision 52009)
@@ -64,8 +64,10 @@
                     uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482. */
                     break;
+
                 case GIMOSID_OSX_106:
                 case GIMOSID_OSX_106_64:
                     uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
                     break;
+
                 case GIMOSID_OSX_107:
                 case GIMOSID_OSX_107_64:
@@ -73,4 +75,5 @@
                     uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
                     break;
+
                 case GIMOSID_OSX_108:
                 case GIMOSID_OSX_108_64:
@@ -78,4 +81,5 @@
                     uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
                     break;
+
                 case GIMOSID_OSX_109:
                 case GIMOSID_OSX_109_64:
@@ -91,5 +95,5 @@
             {
                 CPUMCPUIDLEAF Leaf;
-                int rc = CPUMR3CpuIdGetLeaf(pVM, &Leaf, 1, 0);
+                int rc = CPUMR3CpuIdGetLeaf(pVM, &Leaf, 1, 0 /* uSubLeaf */);
                 if (RT_SUCCESS(rc))
                 {
@@ -101,8 +105,8 @@
                     {
                         uint32_t uNew = Leaf.uEax & UINT32_C(0xf0003000);
-                        uNew |=  RT_BYTE1(uMaxIntelFamilyModelStep) & 0xf;       /* stepping */
-                        uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) & 0xf) << 4; /* 4 low model bits */
-                        uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) >> 4) << 16; /* 4 high model bits */
-                        uNew |= (RT_BYTE3(uMaxIntelFamilyModelStep) & 0xf) << 8; /* 4 low family bits */
+                        uNew |=  RT_BYTE1(uMaxIntelFamilyModelStep) & 0xf;          /* stepping */
+                        uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) & 0xf) << 4;    /* 4 low model bits */
+                        uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) >> 4) << 16;    /* 4 high model bits */
+                        uNew |= (RT_BYTE3(uMaxIntelFamilyModelStep) & 0xf) << 8;    /* 4 low family bits */
                         /* 8 high family bits, Intel's suggested calculation. */
                         if (RT_BYTE3(uMaxIntelFamilyModelStep) > 0xf)
@@ -133,6 +137,4 @@
     }
 
-    /** @todo Register CPUID leaves, MSR ranges with CPUM. */
-    /** -XXX_ CPUMGetGuestCpuId CPUMGetGuestCpuVendor CPUMR3CpuIdInsert  */
     return VINF_SUCCESS;
 }
Index: /trunk/src/VBox/VMM/VMMR3/VM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/VM.cpp	(revision 52008)
+++ /trunk/src/VBox/VMM/VMMR3/VM.cpp	(revision 52009)
@@ -986,6 +986,6 @@
                                                                 if (RT_SUCCESS(rc))
                                                                 {
-                                                                    /* GIM must be init'd before PDM, DevGIM construction may
-                                                                       require GIM provider to be setup. */
+                                                                    /* GIM must be init'd before PDM, gimdevR3Construct()
+                                                                       requires GIM provider to be setup. */
                                                                     rc = GIMR3Init(pVM);
                                                                     if (RT_SUCCESS(rc))
Index: /trunk/src/VBox/VMM/include/GIMHvInternal.h
===================================================================
--- /trunk/src/VBox/VMM/include/GIMHvInternal.h	(revision 52008)
+++ /trunk/src/VBox/VMM/include/GIMHvInternal.h	(revision 52009)
@@ -21,4 +21,9 @@
 #include <VBox/vmm/gim.h>
 #include <VBox/vmm/cpum.h>
+
+/**
+ * GIM Hyper-V saved-state version.
+ */
+#define GIM_HV_SSM_VERSION                 0x1
 
 /** @name Hyper-V base feature identification.
Index: /trunk/src/VBox/VMM/include/GIMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/include/GIMInternal.h	(revision 52008)
+++ /trunk/src/VBox/VMM/include/GIMInternal.h	(revision 52009)
@@ -44,5 +44,5 @@
     /** The provider that is active for this VM. */
     GIMPROVIDERID                    enmProviderId;
-    /** The interface version. */
+    /** The interface implementation version. */
     uint32_t                         u32Version;