Changeset 52110 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 21, 2014 12:53:59 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95132

Message:

VMM/GIM: Make guest-OS Id as part of the saved states as it could be useful in the future to have it in there.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GIM.cpp (modified) (5 diffs)
• GIMHv.cpp (modified) (1 diff)
• GIMMinimal.cpp (modified) (3 diffs)

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

@@ -122 +122 @@
     AssertLogRelRCReturn(rc, rc);
     if (uGuestOsId < GIMOSID_END)
+    {
         GuestOsId = (GIMOSID)uGuestOsId;
+        pVM->gim.s.enmGuestOsId = GuestOsId;
+    }
     else
     {
@@ -145 +148 @@
         {
             pVM->gim.s.enmProviderId = GIMPROVIDERID_MINIMAL;
-            rc = GIMR3MinimalInit(pVM, GuestOsId);
+            rc = GIMR3MinimalInit(pVM);
         }
         else if (!RTStrCmp(szProvider, "HyperV"))
@@ -267 +270 @@
     rc = SSMR3PutU32(pSSM, pVM->gim.s.u32Version);
     AssertRCReturn(rc, rc);
+    rc = SSMR3PutU32(pSSM, pVM->gim.s.enmGuestOsId);
+    AssertRCReturn(rc, rc);
 
     /*
@@ -320 +325 @@
     AssertRCReturn(rc, rc);
     rc = SSMR3GetU32(pSSM, &pVM->gim.s.u32Version);
+    AssertRCReturn(rc, rc);
+    rc = SSMR3GetU32(pSSM, (uint32_t *)&pVM->gim.s.enmGuestOsId);
     AssertRCReturn(rc, rc);
 
@@ -603 +610 @@
 
 /**
- * Checks if the given Guest OS identifier implies an OS X family of guests.
+ * Checks if the GIM Guest OS identifier for this VM implies an OS X family of
+ * guests.
  *
  * @returns true if it's an OS X guest, false otherwise.
- * @param   enmGuestOs      The Guest OS Id.
- */
-VMMR3_INT_DECL(bool) GIMR3IsOSXGuest(GIMOSID enmGuestOs)
-{
-    switch (enmGuestOs)
+ * @param   pVM         Pointer to the VM.
+ */
+VMMR3_INT_DECL(bool) GIMR3IsOSXGuest(PVM pVM)
+{
+    switch (pVM->gim.s.enmGuestOsId)
     {
         case GIMOSID_OSX:

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

@@ -659 +659 @@
         {
             /** @todo Handle raw-mode hypercall page patching. */
-            LogRel(("GIM: HyperV: Raw-mode not yet implemented!\n"));
+            LogRel(("GIM: HyperV: Raw-mode hypercalls not yet implemented!\n"));
         }
         GIMR3Mmio2Unmap(pVM, pRegion);

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

@@ -33 +33 @@
 *******************************************************************************/
 
-VMMR3_INT_DECL(int) GIMR3MinimalInit(PVM pVM, GIMOSID enmGuest)
+VMMR3_INT_DECL(int) GIMR3MinimalInit(PVM pVM)
 {
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
@@ -43 +43 @@
     CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
 
-    if (GIMR3IsOSXGuest(enmGuest))
+    if (GIMR3IsOSXGuest(pVM))
     {
         /*
@@ -58 +58 @@
         {
             uint32_t uMaxIntelFamilyModelStep = UINT32_MAX;
-            switch (enmGuest)
+            switch (pVM->gim.s.enmGuestOsId)
             {
                 case GIMOSID_OSX: