Changeset 14887 in vbox for trunk/src/VBox

Timestamp:

Dec 2, 2008 10:15:21 AM (16 years ago)

Author:

vboxsync

Message:

Disallow any mixed use of hwaccm & software virtualization. Don't override the setting anymore.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• PATM/PATMSSM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -338 +338 @@
         {
             if (pVM->hwaccm.s.vmx.fSupported)
-                VMSetRuntimeError(pVM, false, "HwAccmModeChangeDisallowed",
-                                  "An active VM already uses Intel VT-x hardware acceleration. It is not allowed "
-                                  "to simultaneously use software virtualization, therefore this VM will be run "
-                                  "using VT-x as well.\n");
+                VM_SET_ERROR(pVM, rc, "An active VM already uses Intel VT-x hardware acceleration. It is not allowed "
+                                      "to simultaneously use software virtualization.\n");
             else
-                VMSetRuntimeError(pVM, false, "HwAccmModeChangeDisallowed",
-                                  "An active VM already uses AMD-V hardware acceleration. It is not allowed to "
-                                  "simultaneously use software virtualization, therefore this VM will be run "
-                                  "using AMD-V as well.\n");
+                VM_SET_ERROR(pVM, rc, "An active VM already uses AMD-V hardware acceleration. It is not allowed to "
+                                      "simultaneously use software virtualization.\n");
         }
         else
-            VMSetRuntimeError(pVM, false, "HwAccmModeChangeDisallowed",
-                              "An active VM already uses software virtualization. It is not allowed to simultaneously "
-                              "use VT-x or AMD-V, therefore this VM will be run using software virtualization as well.\n");
+            VM_SET_ERROR(pVM, rc, "An active VM already uses software virtualization. It is not allowed to simultaneously "
+                                  "use VT-x or AMD-V.\n");
+        return rc;
 #endif /* !RT_OS_DARWIN */
     }

trunk/src/VBox/VMM/PATM/PATMSSM.cpp

@@ -707 +707 @@
 #endif
 
-    /* We can't allow a patched VM to be restored when we're currently forced to use VT-x, because another VT-x VM is already running. */
-    if (    PATMIsEnabled(pVM)
-        &&  HWACCMIsEnabled(pVM))
-    {
-        if (CPUMGetCPUVendor(pVM) == CPUMCPUVENDOR_AMD)
-            VM_SET_ERROR(pVM, rc, "An active VM already uses AMD-V hardware acceleration. It is not "
-                                  "allowed to simultaneously use software virtualization.\n");
-        else
-            VM_SET_ERROR(pVM, rc, "An active VM already uses Intel VT-x hardware acceleration. It is not "
-                                  "allowed to simultaneously use software virtualization.\n");
-        return VERR_ACCESS_DENIED;
-    }
-
     return VINF_SUCCESS;
 }