Changeset 52767 in vbox

Timestamp:

Sep 16, 2014 4:51:51 PM (10 years ago)

Author:

vboxsync

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

96137

Message:

VMM/GIM: Get rid of separate fEnabled field, just use the provider to figure out whether it's enabled or not.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GIMAll.cpp (modified) (2 diffs)
• VMMR0/GIMR0.cpp (modified) (1 diff)
• VMMR3/GIM.cpp (modified) (10 diffs)
• include/GIMInternal.h (modified) (1 diff)

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

@@ -40 +40 @@
 VMMDECL(bool) GIMIsEnabled(PVM pVM)
 {
-    return pVM->gim.s.fEnabled;
+    return pVM->gim.s.enmProviderId != GIMPROVIDERID_NONE;
 }
 
@@ -116 +116 @@
 VMM_INT_DECL(bool) GIMIsParavirtTscEnabled(PVM pVM)
 {
-    if (!pVM->gim.s.fEnabled)
-        return false;
-
     switch (pVM->gim.s.enmProviderId)
     {

trunk/src/VBox/VMM/VMMR0/GIMR0.cpp

@@ -90 +90 @@
 VMMR0_INT_DECL(int) GIMR0UpdateParavirtTsc(PVM pVM, uint64_t u64Offset)
 {
-    if (!pVM->gim.s.fEnabled)
-        return VERR_GIM_NOT_ENABLED;
-
     switch (pVM->gim.s.enmProviderId)
     {
         case GIMPROVIDERID_HYPERV:
             return GIMR0HvUpdateParavirtTsc(pVM, u64Offset);
+
+        case GIMPROVIDERID_NONE:
+            return VERR_GIM_NOT_ENABLED;
 
         default:

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

@@ -119 +119 @@
     LogRel(("GIM: Using provider \"%s\" (Implementation version: %u)\n", szProvider, uVersion));
     if (!RTStrCmp(szProvider, "None"))
-    {
-        Assert(!pVM->gim.s.fEnabled);
         pVM->gim.s.enmProviderId = GIMPROVIDERID_NONE;
-    }
     else
     {
-        pVM->gim.s.fEnabled = true;
         pVM->gim.s.u32Version = uVersion;
         /** @todo r=bird: Because u32Version is saved, it should be translated to the
@@ -160 +156 @@
 VMMR3_INT_DECL(int) GIMR3InitCompleted(PVM pVM)
 {
-    if (!pVM->gim.s.fEnabled)
-        return VINF_SUCCESS;
-
     switch (pVM->gim.s.enmProviderId)
     {
@@ -191 +184 @@
     LogFlow(("GIMR3Relocate\n"));
 
-    if (   !pVM->gim.s.fEnabled
+    if (   pVM->gim.s.enmProviderId == GIMPROVIDERID_NONE
         || HMIsEnabled(pVM))
     {
@@ -234 +227 @@
 
     /** @todo Save per-CPU data. */
-    int rc;
+    int rc = VINF_SUCCESS;
 #if 0
     SSMR3PutU32(pSSM, pVM->cCpus);
@@ -246 +239 @@
      * Save per-VM data.
      */
-    SSMR3PutBool(pSSM, pVM->gim.s.fEnabled);
     SSMR3PutU32(pSSM, pVM->gim.s.enmProviderId);
-    rc = SSMR3PutU32(pSSM, pVM->gim.s.u32Version);
-    AssertRCReturn(rc, rc);
+    SSMR3PutU32(pSSM, pVM->gim.s.u32Version);
 
     /*
      * Save provider-specific data.
      */
-    if (pVM->gim.s.fEnabled)
-    {
-        switch (pVM->gim.s.enmProviderId)
-        {
-            case GIMPROVIDERID_HYPERV:
-                rc = GIMR3HvSave(pVM, pSSM);
-                AssertRCReturn(rc, rc);
-                break;
-
-            default:
-                break;
-        }
+    switch (pVM->gim.s.enmProviderId)
+    {
+        case GIMPROVIDERID_HYPERV:
+            rc = GIMR3HvSave(pVM, pSSM);
+            AssertRCReturn(rc, rc);
+            break;
+
+        default:
+            break;
     }
 
@@ -301 +289 @@
      * Load per-VM data.
      */
-    bool fEnabled;
-    SSMR3GetBool(pSSM, &fEnabled);
     uint32_t uProviderId;
-    SSMR3GetU32(pSSM, &uProviderId);
     uint32_t uProviderVersion;
-    rc = SSMR3GetU32(pSSM, &uProviderVersion);
-    AssertRCReturn(rc, rc);
+
+    rc = SSMR3GetU32(pSSM, &uProviderId);           AssertRCReturn(rc, rc);
+    rc = SSMR3GetU32(pSSM, &uProviderVersion);      AssertRCReturn(rc, rc);
 
     if ((GIMPROVIDERID)uProviderId != pVM->gim.s.enmProviderId)
@@ -323 +309 @@
      * Load provider-specific data.
      */
-    if (pVM->gim.s.fEnabled)
-    {
-        switch (pVM->gim.s.enmProviderId)
-        {
-            case GIMPROVIDERID_HYPERV:
-                rc = GIMR3HvLoad(pVM, pSSM, uVersion);
-                AssertRCReturn(rc, rc);
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    return rc;
+    switch (pVM->gim.s.enmProviderId)
+    {
+        case GIMPROVIDERID_HYPERV:
+            rc = GIMR3HvLoad(pVM, pSSM, uVersion);
+            AssertRCReturn(rc, rc);
+            break;
+
+        default:
+            break;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -352 +335 @@
 VMMR3_INT_DECL(int) GIMR3Term(PVM pVM)
 {
-    if (!pVM->gim.s.fEnabled)
-        return VINF_SUCCESS;
-
     switch (pVM->gim.s.enmProviderId)
     {
@@ -378 +358 @@
 VMMR3_INT_DECL(void) GIMR3Reset(PVM pVM)
 {
-    if (!pVM->gim.s.fEnabled)
-        return;
-
     switch (pVM->gim.s.enmProviderId)
     {
@@ -422 +399 @@
 
     *pcRegions = 0;
-    if (!pVM->gim.s.fEnabled)
-        return NULL;
-
     switch (pVM->gim.s.enmProviderId)
     {

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

@@ -40 +40 @@
 typedef struct GIM
 {
-    /** Whether GIM is enabled for this VM or not. */
-    bool                             fEnabled;
     /** The provider that is active for this VM. */
     GIMPROVIDERID                    enmProviderId;